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
cowplot
android-homebutton
pagemethods
chrome-canary
bing-maps
androidpublisher
aiml
precompile-assets
member-access
xcode7-beta5
objectlistview
firebird2.1
error-detection
pluralize
lightopenid
aws-appsync-resolver
xip-file
histogram-of-oriented-gradients
numpy-stl
keycloak-nodejs-connect
google-bigquery
regex-lookarounds
ipython-parallel
ant
redistogo
ggpubr
domainservices
gpu
imagegrab
dartdoc