Show More
@@ -990,7 +990,8 b' def calculateupdates(repo, wctx, mctx, a' | |||||
990 | else: # only when merge.preferancestor=* - the default |
|
990 | else: # only when merge.preferancestor=* - the default | |
991 | repo.ui.note( |
|
991 | repo.ui.note( | |
992 | _("note: merging %s and %s using bids from ancestors %s\n") % |
|
992 | _("note: merging %s and %s using bids from ancestors %s\n") % | |
993 |
(wctx, mctx, _(' and ').join(str(anc) |
|
993 | (wctx, mctx, _(' and ').join(pycompat.bytestr(anc) | |
|
994 | for anc in ancestors))) | |||
994 |
|
995 | |||
995 | # Call for bids |
|
996 | # Call for bids | |
996 | fbids = {} # mapping filename to bids (action method to list af actions) |
|
997 | fbids = {} # mapping filename to bids (action method to list af actions) |
General Comments 0
You need to be logged in to leave comments.
Login now