git config --global merge.tool gvimdiff git config --global mergetool prompt false git config --global merge.conflictstyle diff3 The last is so that we can see the base revision displayed within the merge markers, in the merged file. The base the revision that was the most recent common basis for the two different versions implied in the merge. Rebasing: When git mergetool is invoked with this too