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
powercli
angular-strap
iwconfig
elytron
asp.net-identity
splash-js-render
cpu-cache
craigslist
text-compression
wizard
geodjango
setx
sproutcore
.vhdx
acs
textspan
utm-tracking
pysnmp
winsql
topography
sails-postgresql
scalameta
runtypes
edx
pydash
api-security
tagname
xcode9.3-beta
rippled
amazon-kinesis-analytics