equal
deleted
inserted
replaced
778 actions = manifestmerge(repo, wctx, mctx, ancestors[0], |
778 actions = manifestmerge(repo, wctx, mctx, ancestors[0], |
779 branchmerge, force, |
779 branchmerge, force, |
780 partial, acceptremote, followcopies) |
780 partial, acceptremote, followcopies) |
781 |
781 |
782 else: # only when merge.preferancestor=* - the default |
782 else: # only when merge.preferancestor=* - the default |
783 repo.ui.status( |
783 repo.ui.note( |
784 _("note: merging %s and %s using bids from ancestors %s\n") % |
784 _("note: merging %s and %s using bids from ancestors %s\n") % |
785 (wctx, mctx, _(' and ').join(str(anc) for anc in ancestors))) |
785 (wctx, mctx, _(' and ').join(str(anc) for anc in ancestors))) |
786 |
786 |
787 # Call for bids |
787 # Call for bids |
788 fbids = {} # mapping filename to bids (action method to list af actions) |
788 fbids = {} # mapping filename to bids (action method to list af actions) |