From a596bfbe5738c2da782b8fdfdc0e84853c016f52 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Wed, 19 Jun 2019 13:34:25 -0700
Subject: Set merge driver for .perms

---
 template/info/attributes | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 template/info/attributes

diff --git a/template/info/attributes b/template/info/attributes
new file mode 100644
index 00000000..c84351e0
--- /dev/null
+++ b/template/info/attributes
@@ -0,0 +1,2 @@
+* merge=binary
+/.perms merge=perms
-- 
cgit v1.2.3