diff options
| author | Ori Bernstein <ori@eigenstate.org> | 2021-06-05 17:42:05 +0000 |
|---|---|---|
| committer | Ori Bernstein <ori@eigenstate.org> | 2021-06-05 17:42:05 +0000 |
| commit | a5282f9eab1b78bd65e5144c81bf0f19b3f9efaf (patch) | |
| tree | 3bdf47447ea08d81b862c47c3767760b44b89c17 /sys/src | |
| parent | 5d06e7ad66f2dad04f25948bcdc256f812c47590 (diff) | |
git/{branch,pull}: merge files correctly
merge1 would clobber the global '$base' variable,
which is not what we wanted. Run it in a subshell
with its own env.
Diffstat (limited to 'sys/src')
0 files changed, 0 insertions, 0 deletions