branch | stable |
changeset 46026 | 39e2cf7cb120 |
parent 45555 | feffeb18d412 |
child 46027 | 1d5189a57405 |
--- a/tests/test-rebase-inmemory.t Fri Nov 27 14:54:37 2020 -0500 +++ b/tests/test-rebase-inmemory.t Wed Dec 02 15:15:16 2020 -0800 @@ -487,6 +487,14 @@ [255] $ cat a 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 ..