From b2db4ed759484b16addbe5567411439663fda138 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Mon, 29 Jul 2024 17:25:36 +0100 Subject: [PATCH] git: use nvim for fugitive mergetool --- git/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git/config b/git/config index 579f4c0..1c55d71 100644 --- a/git/config +++ b/git/config @@ -22,7 +22,7 @@ smtpserver = /usr/bin/msmtp smtpuser = [mergetool "fugitive"] - cmd = vim -f -c \"Gdiffsplit!\" \"$MERGED\" + cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\" [merge] tool = fugitive defaultToUpstream = true -- 2.48.1