Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use pycompat.bytestr instead of str
authorPulkit Goyal <7895pulkit@gmail.com>
Sat, 30 Sep 2017 15:48:08 +0530
changeset 34356 6f49ea88d984
parent 34355 1a5abc45e2fa
child 34357 f975cb7c4dbe
py3: use pycompat.bytestr instead of str Differential Revision: https://phab.mercurial-scm.org/D855
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- 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)
hg-stable