X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/blobdiff_plain/089ad2dd938f9caabf21bfbf52179dcdf4a8c6f2..f30e0a60de841c4f3fadf8ca4367352ae638d096:/gitconfig

diff --git a/gitconfig b/gitconfig
index f3cb18d..ff81aab 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,10 +1,10 @@
 [user]
 	name = Ruben Beltran del Rio
-	email = ruben@unlimited.pizza
+	email = git@r.bdr.sh
   signingkey = CF016B28A85750E3C1B80CEB14871BABBDF9DFF5
 [sendemail]
 	smtpserver = smtp.fastmail.com
-	smtpuser = ruben@unlimited.pizza
+	smtpuser = r@bdr.sh
 	smtpencryption = ssl
 	smtpserverport = 465
 [core]
@@ -24,6 +24,7 @@
 	tool = vimdiff
 [merge]
   tool = nvim
+  conflictstyle = zdiff3
 [mergetool]
   keepBackup = false
 [mergetool "nvim"]