From 6364e88b93bd142f9e139269618fb9ae4987885b Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Mon, 3 Mar 2025 13:17:44 +0100
Subject: ...

---
 users/gkleen/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'users/gkleen/default.nix')

diff --git a/users/gkleen/default.nix b/users/gkleen/default.nix
index 074d4866..b018aa85 100644
--- a/users/gkleen/default.nix
+++ b/users/gkleen/default.nix
@@ -61,6 +61,7 @@
             autoStash = true;
             updateRefs = true;
           };
+          merge.conflictstyle = "zdiff3";
         };
       };
 
-- 
cgit v1.2.3