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
gcc4.8
flutter-clippath
albumart
richtextfx
react-thunk
hippocms
tfjs-node
gamma
event-tracking
word-2007
window.onunload
finally
lockscreenwidget
linux-development
captivenetwork
pysvn
thorntail
deedle
python-collections
tesla
cross-compiling
ispf
angular-animations
visual-studio-6
svmlight
inline-svg
vpi
apprtcdemo
handbrake
abcjs