From 0c799ee87a241ee50f0bac971ec67ad6cd89ac44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Wed, 14 Feb 2024 11:18:49 +0200
Subject: [PATCH] git: merge.conflictstyle = "zdiff3"

---
 shared/home/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared/home/default.nix b/shared/home/default.nix
index 1debef8..e9b0b27 100644
--- a/shared/home/default.nix
+++ b/shared/home/default.nix
@@ -153,7 +153,7 @@ in {
         extraConfig = {
           rerere.enabled = true;
           pull.ff = "only";
-          merge.conflictstyle = "diff3";
+          merge.conflictstyle = "zdiff3";
           init.defaultBranch = "main";
         };
       };