Mercurial > hg-stable

diff mercurial/context.py @ 25844:18541e9510c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: make merge.preferancestor type and default consistent (and mark it)
author Matt Mackall <mpm@selenic.com>
date Thu, 25 Jun 2015 17:54:55 -0500
parents 4d1382fd96ff
children 3a0bb61371c5
line wrap: on
line diff
--- a/mercurial/context.py	Thu Jun 25 17:53:16 2015 -0500
+++ b/mercurial/context.py	Thu Jun 25 17:54:55 2015 -0500
@@ -576,7 +576,8 @@
         elif len(cahs) == 1:
             anc = cahs[0]
         else:
-            for r in self._repo.ui.configlist('merge', 'preferancestor'):
+            # experimental config: merge.preferancestor
+            for r in self._repo.ui.configlist('merge', 'preferancestor', ['*']):
                 try:
                     ctx = changectx(self._repo, r)
                 except error.RepoLookupError: