Show More
@@ -638,7 +638,12 b' class rebaseruntime(object):' | |||
|
638 | 638 | b"commit again in the working copy\n" |
|
639 | 639 | ) |
|
640 | 640 | ) |
|
641 | try: | |
|
641 | 642 | cmdutil.bailifchanged(repo) |
|
643 | except error.Abort: | |
|
644 | clearstatus(repo) | |
|
645 | clearcollapsemsg(repo) | |
|
646 | raise | |
|
642 | 647 | self.inmemory = False |
|
643 | 648 | self._assignworkingcopy() |
|
644 | 649 | mergemod.update(repo[p1], wc=self.wctx) |
@@ -489,12 +489,6 b" Retrying without in-memory merge won't l" | |||
|
489 | 489 | dirty |
|
490 | 490 | $ hg status -v |
|
491 | 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 | 493 | Retrying without in-memory merge won't lose merge state |
|
500 | 494 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now