From 614fdf523eb1ae223403a783cd762b466eb30ed5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20B=C3=B6hme?= <mail@moritzboeh.me>
Date: Fri, 20 Jan 2023 10:23:30 +0100
Subject: [PATCH] use zdiff3 instead of regular diff3

---
 modules/programs/git.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/git.nix b/modules/programs/git.nix
index 42497af..c3546e1 100644
--- a/modules/programs/git.nix
+++ b/modules/programs/git.nix
@@ -48,7 +48,7 @@ in
         userEmail = cfg.identity.email;
         extraConfig = {
           init.defaultBranch = "main";
-          merge.conflictstyle = "diff3";
+          merge.conflictstyle = "zdiff3";
         };
         delta.enable = true;
         signing = mkIf cfg.signing {