diff options
| author | Ori Bernstein <ori@eigenstate.org> | 2022-05-15 16:29:48 +0000 |
|---|---|---|
| committer | Ori Bernstein <ori@eigenstate.org> | 2022-05-15 16:29:48 +0000 |
| commit | 5dd9b370a07b49a072025f5cd401361e8988c9e7 (patch) | |
| tree | 050dbe96c19421d1603fbb2554eaa8cab2163f30 /sys/src/cmd/cpp/cpp.c | |
| parent | 1470d22cdbebc9c0c18a590891f2d43d1646f4bd (diff) | |
git/merge: correctly preserve permissions when merging
when doing a 3 way merge of a file, we also need to do a
merge of the permission bits to avoid clobberign them.
Diffstat (limited to 'sys/src/cmd/cpp/cpp.c')
0 files changed, 0 insertions, 0 deletions