mercurial/merge.py
branchstable
changeset 21171 33737ebc6f39
parent 21170 ea3972243320
child 21172 0f0059af920c
--- a/mercurial/merge.py	Mon Apr 21 20:22:14 2014 +0200
+++ b/mercurial/merge.py	Fri Apr 18 13:33:20 2014 +0200
@@ -730,6 +730,10 @@
                                 partial, acceptremote, followcopies)
 
     else: # only when merge.preferancestor=* - experimentalish code
+        repo.ui.status(
+            _("note: merging %s and %s using bids from ancestors %s\n") %
+            (wctx, mctx, _(' and ').join(str(anc) for anc in ancestors)))
+
         # Call for bids
         fbids = {} # mapping filename to list af action bids
         for ancestor in ancestors: