From 2495dc7b2d46ac71dd6fdf62e3ccd8eb24651224 Mon Sep 17 00:00:00 2001 From: Julian Prein Date: Wed, 30 Mar 2022 01:57:20 +0200 Subject: [PATCH] git: Remove `nvimdiff` as `merge.tool` --- .config/git/config | 1 - 1 file changed, 1 deletion(-) diff --git a/.config/git/config b/.config/git/config index 43c5d9d..8ffacab 100644 --- a/.config/git/config +++ b/.config/git/config @@ -34,7 +34,6 @@ [merge] log = true suppressDest = * - tool = nvimdiff [pretty] fixes = Fixes: %h (\"%s\") [pull]