equal
deleted
inserted
replaced
574 if not cahs: |
574 if not cahs: |
575 anc = nullid |
575 anc = nullid |
576 elif len(cahs) == 1: |
576 elif len(cahs) == 1: |
577 anc = cahs[0] |
577 anc = cahs[0] |
578 else: |
578 else: |
579 for r in self._repo.ui.configlist('merge', 'preferancestor'): |
579 # experimental config: merge.preferancestor |
|
580 for r in self._repo.ui.configlist('merge', 'preferancestor', ['*']): |
580 try: |
581 try: |
581 ctx = changectx(self._repo, r) |
582 ctx = changectx(self._repo, r) |
582 except error.RepoLookupError: |
583 except error.RepoLookupError: |
583 continue |
584 continue |
584 anc = ctx.node() |
585 anc = ctx.node() |