From 31dc3fa9b74d22b8752361d1dbad0858aee27c9a Mon Sep 17 00:00:00 2001
From: Marty Oehme <marty.oehme@gmail.com>
Date: Fri, 7 Feb 2025 13:12:47 +0100
Subject: [PATCH] git: Change merge conflict to zdiff3 style

---
 vcs/git/config/git/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vcs/git/config/git/config b/vcs/git/config/git/config
index 013cf64..1bfc097 100644
--- a/vcs/git/config/git/config
+++ b/vcs/git/config/git/config
@@ -11,7 +11,7 @@
 [interactive]
   diffFilter    = git delta --color-only
 [merge]
-  conflictstyle = diff3
+  conflictStyle = zdiff3
 [delta]
   navigate      = true
   line-numbers  = true