From f8ce9ccb21546ea395e3736d29e2ab5b1ccc12f8 Mon Sep 17 00:00:00 2001
From: Sanchayan Maity <maitysanchayan@gmail.com>
Date: Tue, 5 May 2020 11:25:50 +0530
Subject: [PATCH] git: gitconfig: Remove diff3 as conflict style

diff3 as conflict style was required by vim-mergetool. It is not
required by the current plugins we are using.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
---
 git/.gitconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/git/.gitconfig b/git/.gitconfig
index 452fef4..0834f76 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -14,7 +14,6 @@
 	sslVerify = false
 [merge]
 	tool = diffconflicts
-	conflictstyle=diff3
 [mergetool "diffconflicts"]
 	cmd = nvim -c "DiffConflicts" "$MERGED" "$BASE" "$LOCAL" "$REMOTE"
 	trustExitCode = true