From: Samir Benmendil <samir.benmendil@gmail.com>
Date: Thu, 31 Jul 2014 10:05:15 +0000 (+0100)
Subject: git: use fugitive Gvdiff for mergetool + don't ask
X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/5c2d2dd042f91ba1864a767fb3209f06b8a08a5b?ds=sidebyside

git: use fugitive Gvdiff for mergetool + don't ask
---

diff --git a/git/config b/git/config
index bfbfc4c..06d2603 100644
--- a/git/config
+++ b/git/config
@@ -19,3 +19,9 @@
 	smtpserver = smtp.gmail.com
 	smtpuser = samir.benmendil@gmail.com
 	smtpserverport = 587
+[mergetool "fugitive"]
+	cmd = vim -f -c \"Gvdiff\" \"$MERGED\"
+[merge]
+	tool = fugitive
+[mergetool]
+	prompt = no