diff options
| author | Michael Forney <mforney@mforney.org> | 2019-06-19 09:55:12 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2019-06-19 10:03:11 -0700 |
| commit | 72d22dfc73e342d0754fcfb6ce5b13c80edffecb (patch) | |
| tree | edd13a25a99c2ea84ca2c04c9e0162a13c815783 /template | |
| parent | abaacce6fa9ab134e8f7bcaa0abc71c0f44882d8 (diff) | |
Add merge driver for .perms
Diffstat (limited to 'template')
| -rw-r--r-- | template/config | 3 |
1 files changed, 3 insertions, 0 deletions
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 |