Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/context.py
changeset 34479 99c3dee3f6ce
parent 34433 2f5a135b2b04
child 34556 7a8a16f8ea22 
--- 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:
Mercurial