merge: various tidying
update tests to handle corrected output and new workingctx display
abort: edit failed: false exited with status 1transaction abort!rollback completedabort: edit failed: false exited with status 1transaction abort!rollback completed