branch | stable |
changeset 46027 | 1d5189a57405 |
parent 46026 | 39e2cf7cb120 |
child 46030 | 2cf61e66c6d0 |
--- a/tests/test-rebase-inmemory.t Wed Dec 02 15:15:16 2020 -0800 +++ b/tests/test-rebase-inmemory.t Wed Dec 02 15:39:01 2020 -0800 @@ -489,12 +489,6 @@ dirty $ hg status -v M a - # The repository is in an unfinished *rebase* state. - - # To continue: hg rebase --continue - # To abort: hg rebase --abort - # To stop: hg rebase --stop - Retrying without in-memory merge won't lose merge state $ cd ..