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
debug-information
transactiontoolargeexception
filtering
dbt
ember-paper
package-name
miranda
web-architecture
python-telegram-bot
checksum
database-view
msbuild-14.0
opentracing
g2o
include-path
cloud-storage
flipkart-api
subscription
quadruple-precision
masonite
microsoft-rush
oracle9i
blackberry-qnx
linux-kernel-headers
language-comparisons
oneget
pgtap
virtual-directory
mouseup
tensorflow-extended
