summaryrefslogtreecommitdiff
path: root/rc
diff options
context:
space:
mode:
authorglenda <glenda@9front.local>2021-06-05 18:50:20 +0000
committerglenda <glenda@9front.local>2021-06-05 18:50:20 +0000
commit706aad3d94ee4d9ff93c8c21398f0bb471a438da (patch)
tree69a8e6864b44ee39a4b282ac0c7b59efe0f6c3d3 /rc
parenta5282f9eab1b78bd65e5144c81bf0f19b3f9efaf (diff)
downloadplan9front-706aad3d94ee4d9ff93c8c21398f0bb471a438da.tar.xz
git/branch: merge correct set of files
we were switching branches before we got the full list of modified files, which could garble what we were trying to merge.
Diffstat (limited to 'rc')
0 files changed, 0 insertions, 0 deletions