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
erlang
stratum
time-format
database-reconciliation
hci
azure-acr
spim
void-pointers
qualys
qt-slot
restbed
mpmediapickercontroller
bitwise-and
jcrop
custom-element
windows-controls
python-ldap
dijit.form
crunch
commerce
return-by-reference
serilog-sinks-elasticsearch
codeigniter-2
unused-variables
viewdidappear
flickity
swift3.2
fileapi
siri
tinyurl