equal
deleted
inserted
replaced
523 else: |
523 else: |
524 overrides = {('ui', 'forcemerge'): opts.get('tool', '')} |
524 overrides = {('ui', 'forcemerge'): opts.get('tool', '')} |
525 with ui.configoverride(overrides, 'rebase'): |
525 with ui.configoverride(overrides, 'rebase'): |
526 stats = rebasenode(repo, rev, p1, base, self.collapsef, |
526 stats = rebasenode(repo, rev, p1, base, self.collapsef, |
527 dest, wctx=self.wctx) |
527 dest, wctx=self.wctx) |
528 if stats[3] > 0: |
528 if stats.unresolvedcount > 0: |
529 if self.inmemory: |
529 if self.inmemory: |
530 raise error.InMemoryMergeConflictsError() |
530 raise error.InMemoryMergeConflictsError() |
531 else: |
531 else: |
532 raise error.InterventionRequired( |
532 raise error.InterventionRequired( |
533 _('unresolved conflicts (see hg ' |
533 _('unresolved conflicts (see hg ' |