Show More
@@ -628,7 +628,8 b' def _filemerge(premerge, repo, mynode, o' | |||||
628 | # normalize to new-style names (':merge' etc) |
|
628 | # normalize to new-style names (':merge' etc) | |
629 | tool = tool[len('internal'):] |
|
629 | tool = tool[len('internal'):] | |
630 | ui.debug("picked tool '%s' for %s (binary %s symlink %s changedelete %s)\n" |
|
630 | ui.debug("picked tool '%s' for %s (binary %s symlink %s changedelete %s)\n" | |
631 |
% (tool, fd, binary, symlink, |
|
631 | % (tool, fd, pycompat.bytestr(binary), pycompat.bytestr(symlink), | |
|
632 | pycompat.bytestr(changedelete))) | |||
632 |
|
633 | |||
633 | if tool in internals: |
|
634 | if tool in internals: | |
634 | func = internals[tool] |
|
635 | func = internals[tool] |
General Comments 0
You need to be logged in to leave comments.
Login now