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
higher
expirationhandler
socket.io-client
grid.js
sslsocketfactory
xlc
rospy
morse-code
method-resolution-order
tomcat-valve
vnc-viewer
recompose
controlflowguard
networkd3
pydot
url-fragment
apache-cloudstack
slackr
centos6
uipagecontrol
dbforge
swarmplot
kendo-chart
array-indexing
smallbasic
oclif
spring-io
nsnetservice
bonecp
jqgrid-php
