diff options
| author | Michael Forney <mforney@mforney.org> | 2019-06-19 13:34:25 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2019-06-19 22:51:06 -0700 |
| commit | a596bfbe5738c2da782b8fdfdc0e84853c016f52 (patch) | |
| tree | 5978581aad0c2d5d1d050cefb0867a26dd56cc0c | |
| parent | 898321096fe9138f600de955f6dcf2b56c302b2f (diff) | |
Set merge driver for .perms
| -rw-r--r-- | template/info/attributes | 2 |
1 files changed, 2 insertions, 0 deletions
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 |