Use vimdiff as mergetool.

2011-03-19 22:54:18 +08:00
parent cec12059e2
commit 99910a294d
1 changed files with 2 additions and 0 deletions
--- a/.gitconfig
+++ b/.gitconfig
@@ -9,6 +9,8 @@
    ui = auto
 [core]
    preloadindex = yes
+[merge]
+    tool = vimdiff
 [user]
    email = darkkiller@gmail.com
    name = Gea-Suan Lin