From 4cd5653ae418544e94c344b04cf8a6fc48df3089 Mon Sep 17 00:00:00 2001
From: Alex <alex@pnyhf.eu>
Date: Sat, 24 Feb 2024 10:40:19 +0100
Subject: [PATCH] Change git conflict style to zdiff3

Signed-off-by: forge <forge@pnyhf.eu>
---
 git/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git/config b/git/config
index 000ff62..f00d966 100644
--- a/git/config
+++ b/git/config
@@ -78,7 +78,7 @@
 	fsckobjects = true
 
 [merge]
-	conflictstyle = diff3
+	conflictstyle = zdiff3
 
 [diff]
 	algorithm = histogram