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
backendless
cpu-load
bank-conflict
image-capture
bolt-cms
json-ld
sharepointdocumentlibrary
remote-repository
html-components
binary-serialization
queryselector
modern-ui
mediafire
sap-business-technology-platform
owncloud
gpy
pep8
ejabberd-auth
unity-dots
azure-cosmosdb-tables
windows
sap-hr
unidac
continue
split-screen
montecarlo
pygmentize
indexing
obfuscar
sequelpro