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
app-dynamics-query-language
shadow-copy
nreco
unity3d
google-fruit
jaxb2-maven-plugin
unobtrusive-javascript
image-extraction
python-2.3
redirects
semgrep
hypercorn
openscenegraph
geometryproxy
computation-graph
late-static-binding
leex
art-runtime
grid-search
target-platform
get-filehash
angular2-custom-pipes
onblur
jest-client
distance-matrix
rowversion
sql-server-linux
hugo-shortcode
acceleratorkey
overlay-view
