]> git.rmz.io Git - dotfiles.git/blobdiff - git/config
git: use Gdiffsplit! for mergetool
[dotfiles.git] / git / config
index 6e0ef152045893cae3c7634c8f4a4981a6b26521..266b57905f2763c2690960b4e7f9f0f46007c085 100644 (file)
@@ -20,7 +20,7 @@
        smtpserver = /usr/bin/msmtp
        smtpuser = 
 [mergetool "fugitive"]
-       cmd = vim -f -c \"Gvdiff\" \"$MERGED\"
+       cmd = vim -f -c \"Gdiffsplit!\" \"$MERGED\"
 [merge]
        tool = fugitive
        defaultToUpstream = true