Remove 3 way vimdiff

2018-12-14 18:32:23 +00:00 · 2018-12-14 18:32:23 +00:00 · 9511061155
commit 9511061155
parent 71ef3dfba5
1 changed files with 0 additions and 5 deletions
--- a/5
+++ b/5
@ -40,11 +40,6 @@
 [help]
 	autocorrect = -1

-[merge]
-	tool = vimdiff
-	conflictstyle = diff3
-	prompt = false
-
 [pager]
 	status = true