py3: use pycompat.bytestr instead of str

Differential Revision: https://phab.mercurial-scm.org/D855

mercurial/merge.py

@@ -990,7 +990,8 b' def calculateupdates(repo, wctx, mctx, a'
     else: # only when merge.preferancestor=* - the default
         repo.ui.note(
             _("note: merging %s and %s using bids from ancestors %s\n") %
-            (wctx, mctx, _(' and ').join(str(anc) for anc in ancestors)))
+            (wctx, mctx, _(' and ').join(pycompat.bytestr(anc)
+                                            for anc in ancestors)))
 
         # Call for bids
         fbids = {} # mapping filename to bids (action method to list af actions)