From c0f6d1ea7ef17a6cb5f72c44df51f3d6aafb58c4 Mon Sep 17 00:00:00 2001
From: "Agatha V. Lovelace" <agatha@technogothic.net>
Date: Tue, 30 Jan 2024 23:17:16 +0100
Subject: [PATCH] Use zdiff3 in git

---
 common/home_manager/common.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/home_manager/common.nix b/common/home_manager/common.nix
index eb2e9ce..4da2b33 100644
--- a/common/home_manager/common.nix
+++ b/common/home_manager/common.nix
@@ -38,6 +38,7 @@
         extraConfig = {
           init = { defaultBranch = "mistress"; };
           core = { editor = "hx"; };
+          merge.conflictStyle = "zdiff3";
           rebase.autosquash = true;
           pull.rebase = true;
         };