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
x-editable
swagger-codegen-maven-plugin
sysinfo
lookbehind
pi4j
alamofireimage
pingouin
angular2-observables
ibeacon-android
scoped-type-variables
openvz
swagger-editor
microsoft-unit-testing
definitelytyped
web-site-project
jquery-bar-rating
hmatrix
geom-ribbon
iphone-standalone-web-app
linked-server
eudyptula-challenge
qpropertyanimation
aws-php-sdk
pointer-arithmetic
kendo-multiselect
hibernate-validator
swoole
wal-e
database-reconciliation
auto-indent
