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
nav-pills
qheaderview
sql-server
invisible
line-breaks
angular-highcharts
eclipse-3.6
shell-exec
open-closed-principle
fingerprinting
tags
velocity
win32serviceutil
sdp
firrtl
apache-kafka-security
telerik-radbutton
media-keys
g.711
mobileserviceclient
pcre
edsdk
icloud-drive
qt-jambi
bunch
distributed-caching
or-condition
compound-key
angular-providers
url-mapping