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
malsup-ajax-form
buildpack
mms
pandoc-citeproc
ajax.beginform
selinux
dataiku
fatal-error
hspi
qtbluetooth
merge-replication
javafx-2
google-plugin-eclipse
jess
html-lists
bootstrap-menu
android-seekbar
low-level-api
daq-mx
cls
uddi
javafx-tableview
android-maps
vgo
thunderbird-lightning
pact-go
vectormath
lldb
remap
surrogate-pairs