Mercurial > public > mercurial-scm > hg

comparison mercurial/context.py @ 34479:99c3dee3f6ce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configitems: register the 'merge.preferancestor' config
author Boris Feld <boris.feld@octobus.net>
date Fri, 30 Jun 2017 03:43:13 +0200
parents 2f5a135b2b04
children 7a8a16f8ea22
comparison
equal deleted inserted replaced
34478:ef303daefdf7 34479:99c3dee3f6ce
657 anc = nullid 657 anc = nullid
658 elif len(cahs) == 1: 658 elif len(cahs) == 1:
659 anc = cahs[0] 659 anc = cahs[0]
660 else: 660 else:
661 # experimental config: merge.preferancestor 661 # experimental config: merge.preferancestor
662 for r in self._repo.ui.configlist('merge', 'preferancestor', ['*']): 662 for r in self._repo.ui.configlist('merge', 'preferancestor'):
663 try: 663 try:
664 ctx = changectx(self._repo, r) 664 ctx = changectx(self._repo, r)
665 except error.RepoLookupError: 665 except error.RepoLookupError:
666 continue 666 continue
667 anc = ctx.node() 667 anc = ctx.node()