Use vimdiff as mergetool.

This commit is contained in:
Gea-Suan Lin
2011-03-19 22:54:18 +08:00
parent cec12059e2
commit 99910a294d

View File

@@ -9,6 +9,8 @@
ui = auto ui = auto
[core] [core]
preloadindex = yes preloadindex = yes
[merge]
tool = vimdiff
[user] [user]
email = darkkiller@gmail.com email = darkkiller@gmail.com
name = Gea-Suan Lin name = Gea-Suan Lin