changeset 45447 | e7c8a5030a90 |
parent 45385 | 05d19ca33b33 |
child 45459 | ccd3bf4490c1 |
--- a/mercurial/merge.py Thu Sep 03 14:45:16 2020 +0530 +++ b/mercurial/merge.py Wed Aug 26 17:24:22 2020 +0530 @@ -1151,7 +1151,10 @@ # Call for bids # Pick the best bid for each file - repo.ui.note(_(b'\nauction for merging merge bids\n')) + repo.ui.note( + _(b'\nauction for merging merge bids (%d ancestors)\n') + % len(ancestors) + ) mresult = mergeresult() for f, bids in sorted(fbids.items()): # bids is a mapping from action method to list af actions