From 3fdcd0d7a8e5d2f0cd4f09c8f6f96f781e083e70 Mon Sep 17 00:00:00 2001
From: Sanchayan Maity <me@sanchayanmaity.net>
Date: Sat, 28 Dec 2024 18:30:42 +0530
Subject: [PATCH] git: Enable Mergiraf as a merge driver

---
 git/.config/git/attributes | 25 +++++++++++++++++++++++++
 git/.config/git/config     |  3 +++
 2 files changed, 28 insertions(+)

diff --git a/git/.config/git/attributes b/git/.config/git/attributes
index 9f404e4..6eedf0b 100644
--- a/git/.config/git/attributes
+++ b/git/.config/git/attributes
@@ -1,3 +1,28 @@
 package-lock.json binary
 Cargo.lock        binary
 stack.yaml.lock   binary
+
+*.java  merge=mergiraf
+*.rs    merge=mergiraf
+*.go    merge=mergiraf
+*.js    merge=mergiraf
+*.jsx   merge=mergiraf
+*.json  merge=mergiraf
+*.yml   merge=mergiraf
+*.yaml  merge=mergiraf
+*.toml  merge=mergiraf
+*.html  merge=mergiraf
+*.htm   merge=mergiraf
+*.xhtml merge=mergiraf
+*.xml   merge=mergiraf
+*.c     merge=mergiraf
+*.cc    merge=mergiraf
+*.h     merge=mergiraf
+*.cpp   merge=mergiraf
+*.hpp   merge=mergiraf
+*.cs    merge=mergiraf
+*.dart  merge=mergiraf
+*.scala merge=mergiraf
+*.sbt   merge=mergiraf
+*.ts    merge=mergiraf
+*.py    merge=mergiraf
diff --git a/git/.config/git/config b/git/.config/git/config
index f23d01e..ce685ad 100644
--- a/git/.config/git/config
+++ b/git/.config/git/config
@@ -57,6 +57,9 @@
 	conflictstyle = zdiff3
 	ff = only
 	tool = nvimdiff1
+[merge "mergiraf"]
+	name = mergiraf
+	driver = mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P
 [mergetool]
 	hideResolved = false
 	keepBackup = false