facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

py3: convert bool variables to bytes

Browse Source
This commit is contained in:
Pulkit Goyal 2017-06-02 16:57:21 +05:30
parent 457ca6840f
commit 228f493dac
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mercurial/filemerge.py
View File

@ -628,7 +628,8 @@ def _filemerge(premerge, repo, mynode, orig, fcd, fco, fca, labels=None):
# 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]