From 72d22dfc73e342d0754fcfb6ce5b13c80edffecb Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Wed, 19 Jun 2019 09:55:12 -0700
Subject: Add merge driver for .perms

---
 template/config | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'template/config')

diff --git a/template/config b/template/config
index 63b767cd..f63274e5 100644
--- a/template/config
+++ b/template/config
@@ -3,3 +3,6 @@
 	sparseCheckout = true
 [oasis]
 	root = .
+[merge "perms"]
+	name = .perms merge driver
+	driver = ./libexec/mergeperms %O %A %B
-- 
cgit v1.2.3