1 files changed, 2 insertions, 1 deletions
diff --git a/.gitconfig b/.gitconfig
index 5948f58..2dce91a 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -39,13 +39,14 @@
         renames = copies
         colorMoved = zebra
 [merge]
-        conflictstyle = diff3
+        conflictstyle = zdiff3
 [log]
         decorate = short
         date = iso
 [rebase]
         stat = true
         autosquash = true
+        updateRefs = true
 [rerere]
         enabled = true
 [transfer]