From c4953a227acededee23f975d88a69c44d816a853 Mon Sep 17 00:00:00 2001
From: Sam Willcocks <sam@wlcx.cc>
Date: Fri, 5 Dec 2025 16:12:58 +0000
Subject: [PATCH] git: add mergiraf

---
 home/git.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/home/git.nix b/home/git.nix
index 47032e7..5534044 100644
--- a/home/git.nix
+++ b/home/git.nix
@@ -47,6 +47,13 @@
       branch.sort = "-committerdate";
       push.default = "current";
       init.defaultBranch = "main";
+      merge = {
+        conflictStyle = "diff3";
+        mergiraf = {
+          name = "mergiraf";
+          driver = "${pkgs.mergiraf}/bin/mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L";
+        };
+      };
     };
     includes = [
       # Always include local gitconfig if it's there