From 97ef83ef1a8dee9cb5db0b5cdeddb514383947ee Mon Sep 17 00:00:00 2001 From: Tobias Schmidl Date: Thu, 23 Jul 2020 10:27:59 +0200 Subject: [PATCH] gitconfig: switched to vimdiff --- .config/gitconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/gitconfig b/.config/gitconfig index e2f246c..af192b4 100644 --- a/.config/gitconfig +++ b/.config/gitconfig @@ -23,7 +23,7 @@ [merge] conflictstyle = diff3 renormalize = true - tool = vimdiff3 + tool = vimdiff [pack] threads = 0 [pull]