merge: various tidying
update tests to handle corrected output and new workingctx display
abort: repository a not found!255abort: error: Connection refused255abort: repository a not found!255abort: destination '../a' already exists255abort: repository a not found!255abort: destination 'q' already exists