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
phpbb3
nwpathmonitor
typed-arrays
drools
moveable
opentripplanner
wxmaxima
dollar-quoting
moodle
nuance
parsehub
non-standard-evaluation
multipartform-data
mergemap
unreachable-code
raytracing
hedera-hashgraph
linux-toolchain
node-https
database-create
virtualfilesystem
sha1
embedded-linux
forwarding
httpapplication
maven-cobertura-plugin
table-functions
navigator-ios
gpib
skitter-slider