From 3e3b3cd1536f0ecdaef16d22264fc287ff06d3dd Mon Sep 17 00:00:00 2001
From: Sanchayan Maity <maitysanchayan@gmail.com>
Date: Tue, 6 Oct 2020 17:27:36 +0530
Subject: [PATCH] Revert "git: Use vimdiff3 for merge"

This reverts commit 513c5f4dda78805dbd30ada1ce36084e98792461.
---
 git/.gitconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git/.gitconfig b/git/.gitconfig
index 7d0e326..7c6e58d 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -18,7 +18,7 @@
 [diff]
 	colorMoved = default
 [merge]
-	tool = vimdiff3
+	tool = vimdiff
 	conflictstyle = diff3
 	ff = only
 [mergetool]