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/merge.py
changeset 34479 99c3dee3f6ce
parent 34349 6f49ea88d984
child 34486 a57c938e7ac8 
--- 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:
Mercurial