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
index-buffer
pg-notify
redisql
sharepoint-apps
lazy-initialization
qtabwidget
nugetgallery
preemptive
jena
delphi-xe8
nested-function
flatlaf
java-server
uitraitcollection
asyncdisplaykit
audiobus
rexml
ksqldb
android-mediacodec
tortoisesvn
pagespeed-insights
media-url
digit-separator
google-query-language
numeral.js
ber
two-way
menu
associated-types
dotnetbrowser