From 70d5ed9b556650ed4796a49fedd7d401d78d25db Mon Sep 17 00:00:00 2001
From: Jack Platten <jack@platten.me>
Date: Sat, 31 Jan 2026 23:55:54 -0800
Subject: [PATCH] Add .config/git/attributes

---
 private_dot_config/git/attributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 private_dot_config/git/attributes

diff --git a/private_dot_config/git/attributes b/private_dot_config/git/attributes
new file mode 100644
index 0000000..789ed5d
--- /dev/null
+++ b/private_dot_config/git/attributes
@@ -0,0 +1 @@
+* merge=mergiraf
-- 
2.51.2