From f6452d0d49e62534b86865dbb33d4503e9148b43 Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Fri, 24 May 2024 15:41:25 +0100
Subject: zdiff3 is prettier

---
 .gitconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
cgit v1.2.3