Mercurial > hg
changeset 34349:6f49ea88d984
py3: use pycompat.bytestr instead of str
Differential Revision: https://phab.mercurial-scm.org/D855
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Sat, 30 Sep 2017 15:48:08 +0530 |
| parents | 1a5abc45e2fa |
| children | f975cb7c4dbe |
| files | mercurial/merge.py |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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)