]> git.rmz.io Git - dotfiles.git/commitdiff
git: use nvim for fugitive mergetool
authorSamir Benmendil <me@rmz.io>
Mon, 29 Jul 2024 16:25:36 +0000 (17:25 +0100)
committerSamir Benmendil <me@rmz.io>
Mon, 29 Jul 2024 16:28:39 +0000 (17:28 +0100)
git/config

index 579f4c07b2949df1921676821b56a1c0b9635654..1c55d715640918954a5d9907aaae1b277a37fa11 100644 (file)
@@ -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