From 73764de6f415f808d1971aec6401d8efe34bfdd0 Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Sat, 4 Jan 2025 15:48:03 +0100
Subject: [PATCH] Set diff conflictStyle to zdiff3

https://github.blog/open-source/git/highlights-from-git-2-35/
https://git-scm.com/docs/git-config#Documentation/git-config.txt-mergeconflictStyle
---
 home/common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home/common.nix b/home/common.nix
index 2034fce..4d34941 100644
--- a/home/common.nix
+++ b/home/common.nix
@@ -106,7 +106,7 @@
           .kakrc
         ''}";
         safe.directory = "*";
-        merge.conflictstyle = "diff3";
+        merge.conflictstyle = "zdiff3";
       };
     };