From 9511061155369b45bdac5bfd185b571cfe1fe8bc Mon Sep 17 00:00:00 2001
From: "Kenneth Benzie (Benie)" <benie@infektor.net>
Date: Fri, 14 Dec 2018 18:32:23 +0000
Subject: [PATCH] Remove 3 way vimdiff

---
 config | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/config b/config
index c9d48f7..e6e5e3a 100644
--- a/config
+++ b/config
@@ -40,11 +40,6 @@
 [help]
 	autocorrect = -1
 
-[merge]
-	tool = vimdiff
-	conflictstyle = diff3
-	prompt = false
-
 [pager]
 	status = true