I'm using GitExtensions windows software to work with git and i had many trouble configuring it to work with Idea's community edition, to use it as a merge tool
project-properties
audiorecord
lotusscript
background-process
peak-detection
caa
microsoft-dynamics-nav
omeka
elastic-cloud
libvpx-go
transcode
sap-cloud-sdk
hummus.js
wai-aria
barcode-printing
qtconsole
pellet
sse2
named-routing
typescript-definitions
jenkins-pipeline-unit
abstract-type
android-scroll
proof
data-security
custom-error-handling
liberty-maven-plugin
non-type-template-parameter
content-length
automated-refactoring
