gitconfig: revert back to vimdiff

2021-03-15 10:29:37 +01:00 · 2021-03-15 10:29:37 +01:00 · c5edf934ef
parent 55abb84de7
commit c5edf934ef
1 changed files with 2 additions and 2 deletions
--- a/4
+++ b/4
@ -11,13 +11,13 @@ rebase = true

 [merge]
 ff = only
-tool = vimdiff2
+tool = vimdiff

 [mergetool]
 keepBackup = false

 [diff]
-tool = vimdiff2
+tool = vimdiff

 [difftool]
 prompt=true