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
operations
pgloader
seq
apprtcdemo
prepend
proper
program-structure
prettyphoto
shape-predictor
uses-allocator
xfermode
ng2-file-upload
anonymousidentification
openldap
iexpress
bigtable
dolby
ruby-on-rails
mpir
tabu-search
logical-purity
google-shopping-api
eden
sbt-assembly
winbgi
maildir
automationanywhere
m2doc
matrix
timeval