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
xlsm
xlwt
thunderbird
wkuidelegate
css-backgrounds
subsampling
mutiny
react-scroll
user-variables
owl-carousel
keytar
docker-aws
multiple-cursor
cartesian
meteor
wix3.6
cjson
flask-peewee
net-sftp
jquery-animate
opennms
filenet-content-engine
normalizr
reactjs
apache-storm-configs
cfbundledocumenttypes
flip
revolution-slider
videosdk.live
amp-iframe