Permalink
Browse files

Use Vim as git's difftool/mergetool.

  • Loading branch information...
1 parent 056f167 commit b0f45c56cee909df63d3fa44e70fbd97245014ab @jasoncodes committed Dec 9, 2012
Showing with 4 additions and 0 deletions.
  1. +4 −0 config/gitconfig
View
@@ -20,6 +20,10 @@ default = tracking
[merge]
log = true
conflictstyle = diff3
+tool = vimdiff
+
+[mergetool]
+prompt = false
[rebase]
autosquash = true

0 comments on commit b0f45c5

Please sign in to comment.