nvim: don't animate scrolling

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index 579f4c07b2949df1921676821b56a1c0b9635654..406c28c44e829b16ff2e32e110f73a5d5ef7db63 100644 (file)
--- 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
@@ -34,6 +34,7 @@
        autosquash = true
        stat = true
        updateRefs = true
+       rescheduleFailedExec = true
 [status]
        submodulesummary = true
 [rerere]