Show More
@@ -487,6 +487,14 Retrying without in-memory merge won't l | |||||
487 | [255] |
|
487 | [255] | |
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 .. |
General Comments 0
You need to be logged in to leave comments.
Login now