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
bitbar
huxtable
apache-tomee
gd
bots
google-cloud-endpoints
ptx
jemalloc
query-derivation
object-composition
spring-security-kerberos
impyla
revit-2015
single-spa-angular
radium
blackberry-dynamics
virtual-machine
pyscipopt
use-case-diagram
no-data
cons
css-hyphens
callback
symlink-traversal
fetchrequest
xnat
firebase
pythonqt
termius
neo4j-embedded