equal
deleted
inserted
replaced
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 |