equal
deleted
inserted
replaced
551 anc = nullid |
551 anc = nullid |
552 elif len(cahs) == 1: |
552 elif len(cahs) == 1: |
553 anc = cahs[0] |
553 anc = cahs[0] |
554 else: |
554 else: |
555 for r in self._repo.ui.configlist('merge', 'preferancestor'): |
555 for r in self._repo.ui.configlist('merge', 'preferancestor'): |
|
556 if r == '*': |
|
557 continue |
556 ctx = changectx(self._repo, r) |
558 ctx = changectx(self._repo, r) |
557 anc = ctx.node() |
559 anc = ctx.node() |
558 if anc in cahs: |
560 if anc in cahs: |
559 break |
561 break |
560 else: |
562 else: |