Use vimdiff as mergetool.
This commit is contained in:
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user