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
shoes
webintents
dotconnect
bare-metal
store
spidermonkey
overpass-api
aws-media-live
google-domain-api
wcf-web-api
coerce
angular-data
dark-theme
reactjs.net
telerik-open-access
fenics
borrow-checker
directory-structure
jena-rules
algorithmia
buildsrc
pyinvoke
webtest
google-pagespeed
materialized
php-5.6
flowgorithm
qlibrary
count
read-host