]> git.rmz.io Git - dotfiles.git/commitdiff
repos / dotfiles.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: c8a3568)
git: use Gdiffsplit! for mergetool
authorSamir Benmendil <samir.benmendil@ultrahaptics.com>
Sat, 27 Jul 2019 21:04:36 +0000 (22:04 +0100)
committerSamir Benmendil <me@rmz.io>
Sat, 27 Jul 2019 21:08:05 +0000 (22:08 +0100)
git/config patch | blob | history

diff --git a/git/config b/git/config
index 6e0ef152045893cae3c7634c8f4a4981a6b26521..266b57905f2763c2690960b4e7f9f0f46007c085 100644 (file)
--- a/git/config
+++ b/git/config
@@ -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
My dotfiles