Submitter | phabricator |
---|---|
Date | Dec. 2, 2020, 11:46 p.m. |
Message ID | <differential-rev-PHID-DREV-q27sic2qm2iqgwqnqa4s-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/47790/ |
State | Superseded |
Headers | show |
Comments
Patch
diff --git a/tests/test-rebase-inmemory.t b/tests/test-rebase-inmemory.t --- a/tests/test-rebase-inmemory.t +++ b/tests/test-rebase-inmemory.t @@ -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 ..