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
ruby-grape
adehabitathr
spring-boot-devtools
qutip
bridging-header
openpower
google-settings
lambda-authorizer
piwiktracker
kakoune
git-reset
dnsjava
radial
adobe-brackets
fstream
websphere-9
git-reflog
devserver
test-environments
facebook-messenger
elastix-itk
reluctant-quantifiers
alpha-shape
laravel-elixir
css-loader
wikidata
adodb-php
magma
butterworth
smsmanager