changeset 46009 | d767f71b9158 |
parent 45840 | 527ce85c2e60 |
child 46010 | 61c1f29e7f4f |
--- a/tests/test-rebase-inmemory.t Fri Nov 27 18:32:20 2020 +0530 +++ b/tests/test-rebase-inmemory.t Wed Dec 02 15:15:16 2020 -0800 @@ -487,6 +487,14 @@ [20] $ 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 ..