Show More
@@ -481,9 +481,8 b' class rebaseruntime(object):' | |||||
481 | if len(repo[None].parents()) == 2: |
|
481 | if len(repo[None].parents()) == 2: | |
482 | repo.ui.debug('resuming interrupted rebase\n') |
|
482 | repo.ui.debug('resuming interrupted rebase\n') | |
483 | else: |
|
483 | else: | |
484 | try: |
|
484 | overrides = {('ui', 'forcemerge'): opts.get('tool', '')} | |
485 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
|
485 | with ui.configoverride(overrides, 'rebase'): | |
486 | 'rebase') |
|
|||
487 | stats = rebasenode(repo, rev, p1, base, self.collapsef, |
|
486 | stats = rebasenode(repo, rev, p1, base, self.collapsef, | |
488 | dest, wctx=self.wctx) |
|
487 | dest, wctx=self.wctx) | |
489 | if stats and stats[3] > 0: |
|
488 | if stats and stats[3] > 0: | |
@@ -493,8 +492,6 b' class rebaseruntime(object):' | |||||
493 | raise error.InterventionRequired( |
|
492 | raise error.InterventionRequired( | |
494 | _('unresolved conflicts (see hg ' |
|
493 | _('unresolved conflicts (see hg ' | |
495 | 'resolve, then hg rebase --continue)')) |
|
494 | 'resolve, then hg rebase --continue)')) | |
496 | finally: |
|
|||
497 | ui.setconfig('ui', 'forcemerge', '', 'rebase') |
|
|||
498 | if not self.collapsef: |
|
495 | if not self.collapsef: | |
499 | merging = p2 != nullrev |
|
496 | merging = p2 != nullrev | |
500 | editform = cmdutil.mergeeditform(merging, 'rebase') |
|
497 | editform = cmdutil.mergeeditform(merging, 'rebase') |
General Comments 0
You need to be logged in to leave comments.
Login now