oasis

commit: a596bfbe5738c2da782b8fdfdc0e84853c016f52
parent 898321096fe9138f600de955f6dcf2b56c302b2f
Author: Michael Forney <mforney@mforney.org>
Date:   Wed, 19 Jun 2019 13:34:25 -0700

Set merge driver for .perms

Diffstat:
A
template/info/attributes
2
++

1 file changed, 2 insertions(+), 0 deletions(-)
diff --git a/template/info/attributes b/template/info/attributes
@@ -0,0 +1,2 @@
+* merge=binary
+/.perms merge=perms