From 01ae9f1db2b51a7710c3d784e21f292a00f5b8dc Mon Sep 17 00:00:00 2001
From: jacekpoz <jacekpoz@cock.li>
Date: Sat, 17 Feb 2024 16:15:33 +0100
Subject: [PATCH] zdiff3 for merge conflicts

---
 modules/cli/git.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/cli/git.nix b/modules/cli/git.nix
index c62968e..dce2c1a 100644
--- a/modules/cli/git.nix
+++ b/modules/cli/git.nix
@@ -50,6 +50,7 @@ in {
                             init.defaultBranch = cfg.defaultBranch;
                             push.autoSetupRemote = true;
                             commit.verbose = true;
+                            merge.conflictstyle = "zdiff3";
                             interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only";
                         };
                     }