--- a/mercurial/filemerge.py Sat Nov 28 17:06:29 2015 +0800
+++ b/mercurial/filemerge.py Wed Nov 25 14:25:26 2015 -0800
@@ -566,8 +566,8 @@
if tool in internals and tool.startswith('internal:'):
# normalize to new-style names (':merge' etc)
tool = tool[len('internal'):]
- ui.debug("picked tool '%s' for %s (binary %s symlink %s)\n" %
- (tool, fd, binary, symlink))
+ ui.debug("picked tool '%s' for %s (binary %s symlink %s changedelete %s)\n"
+ % (tool, fd, binary, symlink, changedelete))
if tool in internals:
func = internals[tool]