Mercurial > public > mercurial-scm > hg-stable
diff mercurial/filemerge.py @ 27161:296d55def9c4
filemerge: add debug output for whether this is a change/delete conflict
Just like binary and symlink conflicts, change/delete conflicts influence the
tool picked.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Wed, 25 Nov 2015 14:25:26 -0800 |
| parents | 9c870e3efab7 |
| children | 4ab69be0ea15 |
line wrap: on
line diff
--- 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]