X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/947105c36b4dd765db4164183bbb99ecc4160d0b..refs/heads/uh-backup:/git/config

diff --git a/git/config b/git/config
index 6e0ef15..04e0405 100644
--- a/git/config
+++ b/git/config
@@ -1,6 +1,6 @@
 [user]
 	name = Samir Benmendil
-	email = me@rmz.io
+	email = samir.benmendil@ultrahaptics.com
 [color]
 	branch = auto
 	status = auto
@@ -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