b360a7c765
when doing a 3 way merge of a file, we also need to do a merge of the permission bits to avoid clobberign them. |
||
---|---|---|
.. | ||
acid | ||
antiword | ||
astar | ||
backup | ||
blit | ||
c64 | ||
dist | ||
fax | ||
ghostscript | ||
git | ||
kbmap | ||
lex | ||
lp | ||
man | ||
music/icon | ||
plumb | ||
postscript | ||
scribble/classifiers | ||
sysconfig | ||
texmf/tex/generic/hyphen | ||
tls | ||
tmac | ||
troff | ||
wiki | ||
amspell | ||
bclib | ||
brspell | ||
eqnchar | ||
grap.defines | ||
hgrc | ||
httpd.rewrite | ||
mimetype | ||
newuser | ||
rootbind | ||
rootstub | ||
samsave | ||
scsicodes | ||
subscribers | ||
webls.denied | ||
yaccpar | ||
yaccpars |