Mercurial > public > mercurial-scm > hg-stable

diff mercurial/filemerge.py @ 32773:264b86cf2092

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: convert bool variables to bytes
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 02 Jun 2017 16:57:21 +0530
parents 6587427b2018
children 2ecce24dfcd3
line wrap: on
line diff
--- a/mercurial/filemerge.py	Fri Jun 09 13:07:49 2017 +0900
+++ b/mercurial/filemerge.py	Fri Jun 02 16:57:21 2017 +0530
@@ -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]