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
atag
pytransitions
downloadfileasync
battery
azure-private-dns
opencv3.0
angularjs-factory
ampy
kmodes
branch
multistage-pipeline
checkbox
typescript-mixins
solrnet
activex
localdatetime
rusqlite
subsystem
restier
daemonset
transcode
docker-aws
rnotebook
lookback
python-argh
babel-polyfill
delphi-xe3
qtableview
alfresco-module-package
v8js