From 513c5f4dda78805dbd30ada1ce36084e98792461 Mon Sep 17 00:00:00 2001
From: Sanchayan Maity <maitysanchayan@gmail.com>
Date: Thu, 24 Sep 2020 20:38:07 +0530
Subject: [PATCH] git: Use vimdiff3 for merge

Use vimdiff3 instead of vimdiff. Might be better as mentioned below?
https://github.com/git/git/commit/7c147b77d34f072c40b912fafba499727921fa6e
---
 git/.gitconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git/.gitconfig b/git/.gitconfig
index 3054947..ae20b24 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -15,7 +15,7 @@
 [fetch]
 	prune = true
 [merge]
-	tool = vimdiff
+	tool = vimdiff3
 	conflictstyle = diff3
 [mergetool]
 	prompt = false