From 730ab418e756ee985a5bf9f983a14d00d570026d Mon Sep 17 00:00:00 2001
From: zendesk-acicchetti <anthony.cicchetti@zendesk.com>
Date: Fri, 30 Apr 2021 10:00:17 -0400
Subject: [PATCH] Remove vimdiff, cause we don't use vim anymore

---
 git/gitconfig | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/git/gitconfig b/git/gitconfig
index 5bc0474..43fd22f 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -19,12 +19,5 @@
     follow = true
 [pull]
 	rebase = true
-[diff]
-	tool = vimdiff
-[merge]
-	tool = vimdiff
-	conflictstyle = diff3
-[mergetool "vimdiff"]
-	cmd = nvim -d $BASE $LOCAL $REMOTE
 [init]
 	defaultBranch = main