From c5edf934efc53501b4317c98efbfb6ab9435edd4 Mon Sep 17 00:00:00 2001 From: bretello Date: Mon, 15 Mar 2021 10:29:37 +0100 Subject: [PATCH] gitconfig: revert back to vimdiff --- gitconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitconfig b/gitconfig index 8060699..a177522 100644 --- a/gitconfig +++ b/gitconfig @@ -11,13 +11,13 @@ rebase = true [merge] ff = only -tool = vimdiff2 +tool = vimdiff [mergetool] keepBackup = false [diff] -tool = vimdiff2 +tool = vimdiff [difftool] prompt=true