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 |