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
dynamic-columns
high-level
android-savedstate
createjs
mapped-types
outlet
greenlock
searchkick
ffmpeg.js
fuzzing
grapecity
postgresql-9.0
permissions
livequery
custom-headers
asciidoc
timer-trigger
laravel-forge
streamreader
gearman
fusion
vtk.js
dialogflow-es
zbar
discord-interactions
app-dynamics-query-language
es5-shim
angular-breadcrumb
placeholder
spacemacs