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
opengl-es-3.0
jdk1.6
pyqtlet
uideviceorientation
xlib
libman
lazy-sequences
todataurl
shedlock
android-external-storage
renderaction
channel-api
static-cast
message-body
ocfs2
shadow-cljs
comparison-operators
boost-histogram
user-defined-literals
babel-preset-env
sametime
screensaver
cartalyst
getuikit
corda-flow
amazon-cloudformation
pascalscript
sharpdx
sfnetwork
filechooser