# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1435272895 18000
# Node ID 18541e9510c55fd4dadac13ee3f4f2d44a73cc5c
# Parent  bf9ea348b48702da63c106709cd2a19a8f4417c4
merge: make merge.preferancestor type and default consistent

(and mark it)

diff -r bf9ea348b487 -r 18541e9510c5 mercurial/context.py
--- 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:
diff -r bf9ea348b487 -r 18541e9510c5 mercurial/merge.py
--- a/mercurial/merge.py	Thu Jun 25 17:53:16 2015 -0500
+++ b/mercurial/merge.py	Thu Jun 25 17:54:55 2015 -0500
@@ -1011,7 +1011,7 @@
 
         p2 = repo[node]
         if pas[0] is None:
-            if repo.ui.config('merge', 'preferancestor', '*') == '*':
+            if repo.ui.configlist('merge', 'preferancestor', ['*']) == ['*']:
                 cahs = repo.changelog.commonancestorsheads(p1.node(), p2.node())
                 pas = [repo[anc] for anc in (sorted(cahs) or [nullid])]
             else: