Mercurial Mercurial > mercurial / 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 22672 19903277f035
parent 22405 6f63c47cbb86
child 22673 16a46003b50c 
--- a/mercurial/merge.py	Wed Oct 01 03:40:51 2014 +0200
+++ b/mercurial/merge.py	Wed Oct 01 03:41:11 2014 +0200
@@ -779,7 +779,7 @@
                                 branchmerge, force,
                                 partial, acceptremote, followcopies)
 
-    else: # only when merge.preferancestor=* - experimentalish code
+    else: # only when merge.preferancestor=* - the default
         repo.ui.status(
             _("note: merging %s and %s using bids from ancestors %s\n") %
             (wctx, mctx, _(' and ').join(str(anc) for anc in ancestors)))
@@ -1048,7 +1048,7 @@
 
         p2 = repo[node]
         if pas[0] is None:
-            if repo.ui.config("merge", "preferancestor") == '*':
+            if repo.ui.config("merge", "preferancestor", '*') == '*':
                 cahs = repo.changelog.commonancestorsheads(p1.node(), p2.node())
                 pas = [repo[anc] for anc in (sorted(cahs) or [nullid])]
             else:
mercurial