From ba6aaa0e0a2046196eafa635e8fd53b1e4901286 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Tue, 14 Oct 2025 22:08:24 +0200
Subject: [PATCH] mergiraf: add merge.conflictStyle git configuration

Mergiraf expects merge.conflictStyle to be "diff3" in git. If this isn't
the case, mergiraf cannot operate correctly. This change adds this
option to git's configuration.
---
 modules/programs/mergiraf.nix                     | 9 ++++++---
 tests/modules/programs/mergiraf/mergiraf-git.conf | 3 +++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/modules/programs/mergiraf.nix b/modules/programs/mergiraf.nix
index 80a18ab6d..3dfb798fc 100644
--- a/modules/programs/mergiraf.nix
+++ b/modules/programs/mergiraf.nix
@@ -30,9 +30,12 @@ in
     programs.git = {
       attributes = [ "* merge=mergiraf" ];
       extraConfig = {
-        merge.mergiraf = {
-          name = "mergiraf";
-          driver = "${mergiraf} merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L";
+        merge = {
+          mergiraf = {
+            name = "mergiraf";
+            driver = "${mergiraf} merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L";
+          };
+          conflictStyle = "diff3";
         };
       };
     };
diff --git a/tests/modules/programs/mergiraf/mergiraf-git.conf b/tests/modules/programs/mergiraf/mergiraf-git.conf
index 46da0369f..9fd703f7c 100644
--- a/tests/modules/programs/mergiraf/mergiraf-git.conf
+++ b/tests/modules/programs/mergiraf/mergiraf-git.conf
@@ -4,6 +4,9 @@
 [gpg "openpgp"]
 	program = "@gnupg@/bin/gpg"
 
+[merge]
+	conflictStyle = "diff3"
+
 [merge "mergiraf"]
 	driver = "@mergiraf@/bin/mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L"
 	name = "mergiraf"