Mercurial > public > mercurial-scm > hg-stable

diff mercurial/context.py @ 34480: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
line wrap: on
line diff
--- a/mercurial/context.py	Fri Jun 30 03:39:10 2017 +0200
+++ b/mercurial/context.py	Fri Jun 30 03:43:13 2017 +0200
@@ -659,7 +659,7 @@
             anc = cahs[0]
         else:
             # experimental config: merge.preferancestor
-            for r in self._repo.ui.configlist('merge', 'preferancestor', ['*']):
+            for r in self._repo.ui.configlist('merge', 'preferancestor'):
                 try:
                     ctx = changectx(self._repo, r)
                 except error.RepoLookupError: