equal
deleted
inserted
replaced
485 rollback completed |
485 rollback completed |
486 abort: uncommitted changes |
486 abort: uncommitted changes |
487 [20] |
487 [20] |
488 $ cat a |
488 $ cat a |
489 dirty |
489 dirty |
|
490 $ hg status -v |
|
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 |
490 |
498 |
491 Retrying without in-memory merge won't lose merge state |
499 Retrying without in-memory merge won't lose merge state |
492 $ cd .. |
500 $ cd .. |
493 $ hg clone repo3 repo3-merge-state -q |
501 $ hg clone repo3 repo3-merge-state -q |
494 $ cd repo3-merge-state |
502 $ cd repo3-merge-state |