WorthyD
1/27/2015 - 2:22 PM

gvimdiff

git mergetool -t gvimdiff

:diffg RE  " get from REMOTE
:diffg BA  " get from BASE
:diffg LO  " get from LOCAL