equal
deleted
inserted
replaced
629 anc = cahs[0] |
629 anc = cahs[0] |
630 else: |
630 else: |
631 # experimental config: merge.preferancestor |
631 # experimental config: merge.preferancestor |
632 for r in self._repo.ui.configlist('merge', 'preferancestor'): |
632 for r in self._repo.ui.configlist('merge', 'preferancestor'): |
633 try: |
633 try: |
634 ctx = changectx(self._repo, r) |
634 ctx = scmutil.revsymbol(self._repo, r) |
635 except error.RepoLookupError: |
635 except error.RepoLookupError: |
636 continue |
636 continue |
637 anc = ctx.node() |
637 anc = ctx.node() |
638 if anc in cahs: |
638 if anc in cahs: |
639 break |
639 break |