# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1506766688 -19800
# Node ID 6f49ea88d9848a9389f108aee7285614b79a188e
# Parent  1a5abc45e2fabbacbf9a8d556d78b68d0eb09dd1
py3: use pycompat.bytestr instead of str

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

diff -r 1a5abc45e2fa -r 6f49ea88d984 mercurial/merge.py
--- a/mercurial/merge.py	Sat Sep 30 15:45:15 2017 +0530
+++ b/mercurial/merge.py	Sat Sep 30 15:48:08 2017 +0530
@@ -990,7 +990,8 @@
     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)