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
timagelist
tuples
virtual-environment
wkwebviewconfiguration
clipboard
splunk-dbconnect
confidence-interval
bits
entity
checkin-policy
wear.watchface
tui-calendar
railscasts
asp.net-core-mvc
nested-class
netsuite
duktape
bytestring
pylucene
entity-framework-core-2.1
craigslist
qcc
casing
preventdefault
ply
valuestack
protractor
nagios
munin
javafx-tableview