From 7c8d3a460408cd81886a0038fb1be917a3cffe05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Dudr?= Date: Sun, 15 Jan 2023 13:20:23 +0100 Subject: [PATCH] git: vimdiff -> nvimdiff --- dot_config/git/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot_config/git/config b/dot_config/git/config index 1f7352d..376fd15 100644 --- a/dot_config/git/config +++ b/dot_config/git/config @@ -40,5 +40,5 @@ smtpserveroption = tdj [merge] - tool = vimdiff + tool = nvimdiff conflictstyle = diff3