Mercurial > public > mercurial-scm > hg

comparison mercurial/filemerge.py @ 27161:296d55def9c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
27160:c533435cbc37 27161:296d55def9c4
564 changedelete = fcd.isabsent() or fco.isabsent() 564 changedelete = fcd.isabsent() or fco.isabsent()
565 tool, toolpath = _picktool(repo, ui, fd, binary, symlink, changedelete) 565 tool, toolpath = _picktool(repo, ui, fd, binary, symlink, changedelete)
566 if tool in internals and tool.startswith('internal:'): 566 if tool in internals and tool.startswith('internal:'):
567 # normalize to new-style names (':merge' etc) 567 # normalize to new-style names (':merge' etc)
568 tool = tool[len('internal'):] 568 tool = tool[len('internal'):]
569 ui.debug("picked tool '%s' for %s (binary %s symlink %s)\n" % 569 ui.debug("picked tool '%s' for %s (binary %s symlink %s changedelete %s)\n"
570 (tool, fd, binary, symlink)) 570 % (tool, fd, binary, symlink, changedelete))
571 571
572 if tool in internals: 572 if tool in internals:
573 func = internals[tool] 573 func = internals[tool]
574 mergetype = func.mergetype 574 mergetype = func.mergetype
575 onfailure = func.onfailure 575 onfailure = func.onfailure