Mercurial > hg
comparison tests/test-rebase-inmemory.t @ 46027:1d5189a57405 stable 5.6.1
rebase: clear merge state when aborting in-memory merge on dirty working copy
Differential Revision: https://phab.mercurial-scm.org/D9509
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 02 Dec 2020 15:39:01 -0800 |
parents | 39e2cf7cb120 |
children | 2cf61e66c6d0 |
comparison
equal
deleted
inserted
replaced
46026:39e2cf7cb120 | 46027:1d5189a57405 |
---|---|
487 [255] | 487 [255] |
488 $ cat a | 488 $ cat a |
489 dirty | 489 dirty |
490 $ hg status -v | 490 $ hg status -v |
491 M a | 491 M a |
492 # The repository is in an unfinished *rebase* state. | |
493 | |
494 # To continue: hg rebase --continue | |
495 # To abort: hg rebase --abort | |
496 # To stop: hg rebase --stop | |
497 | |
498 | 492 |
499 Retrying without in-memory merge won't lose merge state | 493 Retrying without in-memory merge won't lose merge state |
500 $ cd .. | 494 $ cd .. |
501 $ hg clone repo3 repo3-merge-state -q | 495 $ hg clone repo3 repo3-merge-state -q |
502 $ cd repo3-merge-state | 496 $ cd repo3-merge-state |