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
signed-integer
controllers
webpack-mix
jconnect
zedgraph
ssh2
gemspecs
pyspark-sql
kreya
xrm-tooling-connector
activity-state
midi.js
dead-letter
paypal-soap
greedy
approximate-nn-searching
orgchart
truthiness
backbone.js
pptp
thinking-sphinx
ilias
react-button
marginal-effects
jaxer
windows-phone-8.1
jupyterhub
cursors
web-development-server
resource-governor