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
java-money
68hc
call
simpledom
attrackingmanager
iso9660
authentication-flows
operator-precedence
notice
identity-insert
tweetinvi
git-submodules
object-slicing
django-permissions
apache-commons-codec
xmltype
simctl
image-editor
observablecollection
default-selected
magickwand
brian
subdocument
git-sync
dataflow
process-explorer
jmx
bombardier
informatica-powerexchange
hql