equal
deleted
inserted
replaced
636 _( |
636 _( |
637 b"hit merge conflicts; rebasing that " |
637 b"hit merge conflicts; rebasing that " |
638 b"commit again in the working copy\n" |
638 b"commit again in the working copy\n" |
639 ) |
639 ) |
640 ) |
640 ) |
641 cmdutil.bailifchanged(repo) |
641 try: |
|
642 cmdutil.bailifchanged(repo) |
|
643 except error.Abort: |
|
644 clearstatus(repo) |
|
645 clearcollapsemsg(repo) |
|
646 raise |
642 self.inmemory = False |
647 self.inmemory = False |
643 self._assignworkingcopy() |
648 self._assignworkingcopy() |
644 mergemod.update(repo[p1], wc=self.wctx) |
649 mergemod.update(repo[p1], wc=self.wctx) |
645 rebasenode( |
650 rebasenode( |
646 repo, |
651 repo, |