From 35d9231411baa43ae214dcf1245f3b570d366e3e Mon Sep 17 00:00:00 2001
From: sommerfeld <sommerfeld@sommerfeld.dev>
Date: Fri, 31 Jan 2025 17:29:58 +0000
Subject: Add mergiraf

---
 home/.config/git/config | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'home/.config/git/config')

diff --git a/home/.config/git/config b/home/.config/git/config
index 4500dc4..8638332 100644
--- a/home/.config/git/config
+++ b/home/.config/git/config
@@ -35,7 +35,10 @@
     ff = only
 [merge]
     tool = conflictmarker
-    conflictstyle = diff3
+    conflictstyle = zdiff3
+[merge "mergiraf"]
+    name = mergiraf
+    driver = mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P
 [mergetool "conflictmarker"]
     cmd = $EDITOR "$MERGED"
 [commit]
-- 
cgit v1.2.3-70-g09d2