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
apache-config
monkeyc
linux-toolchain
vimoutliner
msi-patch
dbase
openpdf
gcc4.9
facebook-stream-story
synchronize
android-inflate
steambot
master
java-stored-procedures
named-routing
itsdangerous
gevent-socketio
ikimagekit
cross-env
qscript
testem
system.drawing.color
directory-structure
mongorepository
autodiscovery
remoteapp
socket.io-redis
pandoc-citeproc
httpentity
sencha-touch
