Make vimdiff the default Git mergetool
This commit is contained in:
parent
eb4ec29abc
commit
c81060660c
|
@ -3,3 +3,5 @@
|
||||||
[user]
|
[user]
|
||||||
name = The Magician
|
name = The Magician
|
||||||
email = themagician@engineer.com
|
email = themagician@engineer.com
|
||||||
|
[merge]
|
||||||
|
tool = vimdiff
|
||||||
|
|
Loading…
Reference in New Issue