From: Samir Benmendil Date: Mon, 29 Jul 2024 16:25:36 +0000 (+0100) Subject: git: use nvim for fugitive mergetool X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/b2db4ed759484b16addbe5567411439663fda138 git: use nvim for fugitive mergetool --- 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