1 files changed, 0 insertions, 2 deletions

diff --git a/.gitconfig b/.gitconfig
index 056e73c..d582072 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -6,5 +6,3 @@
 	ff = only
 [commit]
 	gpgsign = true
-[merge]
-	tool = vimdiff