From c54dce38176ef20675fbb11b7c855cb60eec46b3 Mon Sep 17 00:00:00 2001
From: Lander Van den Bulcke <landervandenbulcke@gmail.com>
Date: Fri, 19 Sep 2025 10:09:42 +0200
Subject: [PATCH] feat: use mergiraf

Signed-off-by: Lander Van den Bulcke <landervandenbulcke@gmail.com>
---
 home/lander/features/cli/git/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/home/lander/features/cli/git/default.nix b/home/lander/features/cli/git/default.nix
index 9a712de..e49f68b 100644
--- a/home/lander/features/cli/git/default.nix
+++ b/home/lander/features/cli/git/default.nix
@@ -61,6 +61,9 @@ in
 
       # sign your commits!
       commit.gpgsign = true;
+
+      # diff3 merge
+      merge.conflictStyle = "diff3";
     };
 
     # This is optional, as `git identity` will call the `git-identity` script by itself, however
@@ -76,4 +79,7 @@ in
       enableAsDifftool = true;
     };
   };
+
+  # use mergiraf
+  programs.mergiraf.enable = true;
 }