mercurial/merge.py
changeset 22673 16a46003b50c
parent 22672 19903277f035
child 22822 7a06ad9518c0
--- a/mercurial/merge.py	Wed Oct 01 03:41:11 2014 +0200
+++ b/mercurial/merge.py	Wed Oct 01 03:42:00 2014 +0200
@@ -780,7 +780,7 @@
                                 partial, acceptremote, followcopies)
 
     else: # only when merge.preferancestor=* - the default
-        repo.ui.status(
+        repo.ui.note(
             _("note: merging %s and %s using bids from ancestors %s\n") %
             (wctx, mctx, _(' and ').join(str(anc) for anc in ancestors)))