gitconfig: switched to vimdiff
This commit is contained in:
parent
374a519f89
commit
97ef83ef1a
1 changed files with 1 additions and 1 deletions
|
@ -23,7 +23,7 @@
|
||||||
[merge]
|
[merge]
|
||||||
conflictstyle = diff3
|
conflictstyle = diff3
|
||||||
renormalize = true
|
renormalize = true
|
||||||
tool = vimdiff3
|
tool = vimdiff
|
||||||
[pack]
|
[pack]
|
||||||
threads = 0
|
threads = 0
|
||||||
[pull]
|
[pull]
|
||||||
|
|
Loading…
Reference in a new issue