# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 1498786993 -7200
# Node ID 99c3dee3f6cea9f33606d853ed809b8e2cc23de4
# Parent  ef303daefdf77ff14b934ecc5225eb6670419675
configitems: register the 'merge.preferancestor' config

diff -r ef303daefdf7 -r 99c3dee3f6ce mercurial/configitems.py
--- a/mercurial/configitems.py	Fri Jun 30 03:39:10 2017 +0200
+++ b/mercurial/configitems.py	Fri Jun 30 03:43:13 2017 +0200
@@ -302,6 +302,9 @@
 coreconfigitem('merge', 'followcopies',
     default=True,
 )
+coreconfigitem('merge', 'preferancestor',
+        default=lambda: ['*'],
+)
 coreconfigitem('pager', 'ignore',
     default=list,
 )
diff -r ef303daefdf7 -r 99c3dee3f6ce mercurial/context.py
--- 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:
diff -r ef303daefdf7 -r 99c3dee3f6ce mercurial/merge.py
--- a/mercurial/merge.py	Fri Jun 30 03:39:10 2017 +0200
+++ b/mercurial/merge.py	Fri Jun 30 03:43:13 2017 +0200
@@ -1566,7 +1566,7 @@
 
         p2 = repo[node]
         if pas[0] is None:
-            if repo.ui.configlist('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: