From 923f88172535d067f8d1095c6f08996e2191f6f4 Mon Sep 17 00:00:00 2001
From: Ismo Vuorinen <ismo@ivuorinen.net>
Date: Fri, 16 May 2025 21:50:29 +0300
Subject: [PATCH] chore(config): change git merge conflictStyle

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

diff --git a/config/git/config b/config/git/config
index 713e963..34e0623 100644
--- a/config/git/config
+++ b/config/git/config
@@ -46,7 +46,7 @@
 	autoStash = true
 	updateRefs = true
 [merge]
-	conflictstyle = zdiff3
+	conflictStyle = diff3
 [pull]
 	rebase = true
 [color "diff-highlight"]