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
project.json
bcryptjs
gameplay-kit
maven-3
nsthread
platyps
uicontrolevents
request.financial
clause
projects
webrtc-android
odt
gopacket
urlcomponents
nsformatter
ggalluvial
healthd
heapq
loki
formsflow
swagger-codegen
lossy-compression
mapwingis
luarocks
geojsonio
maven-javadoc-plugin
setscripttimeout
slim-lang
sidekiq-cron
catia