Mercurial > public > mercurial-scm > hg

diff mercurial/merge.py @ 34479: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 6f49ea88d984
children a57c938e7ac8
line wrap: on
line diff
--- 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: