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
identitymodel
assembly-references
libusb
traversal
docbook
android-homebutton
memmap
password-retrieval
pdfobject
ofstream
mongodb-php
apex
application.cfc
athena
tfjs-node
hybridauth
saxon-js
scrollmagic
vba
entity-sql
pulseaudio
nodiscard
coingecko
idhttp
scala-version-cross-build
contiki-process
idoc
cordova-plugin-advanced-http
cloning
rendermonkey
