Mercurial > hg > mercurial-source
changeset 33536:264b86cf2092
py3: convert bool variables to bytes
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Fri, 02 Jun 2017 16:57:21 +0530 |
parents | dc7efa2826e4 |
children | 723de0ad3d8b |
files | mercurial/filemerge.py |
diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/filemerge.py +++ b/mercurial/filemerge.py @@ -628,7 +628,8 @@ # normalize to new-style names (':merge' etc) tool = tool[len('internal'):] ui.debug("picked tool '%s' for %s (binary %s symlink %s changedelete %s)\n" - % (tool, fd, binary, symlink, changedelete)) + % (tool, fd, pycompat.bytestr(binary), pycompat.bytestr(symlink), + pycompat.bytestr(changedelete))) if tool in internals: func = internals[tool]