From cd05f3598b8356f5b83251135666d37dadcdc750 Mon Sep 17 00:00:00 2001
From: Samir Benmendil <samir.benmendil@ultrahaptics.com>
Date: Sat, 27 Jul 2019 22:04:36 +0100
Subject: [PATCH] git: use Gdiffsplit! for mergetool

---
 git/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git/config b/git/config
index 6e0ef15..266b579 100644
--- 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
-- 
2.48.1