1 files changed, 1 insertions, 1 deletions

diff --git a/.gitconfig b/.gitconfig
index 3f50819..c8765b1 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -37,7 +37,7 @@
         renames = copies
         colorMoved = zebra
 [merge]
-        conflictstyle = diff3
+        conflictstyle = zdiff3
 [log]
         decorate = short
         date = iso