equal
deleted
inserted
replaced
131 return tool in internals and internals[tool].mergetype == nomerge |
131 return tool in internals and internals[tool].mergetype == nomerge |
132 |
132 |
133 def check(tool, pat, symlink, binary, changedelete): |
133 def check(tool, pat, symlink, binary, changedelete): |
134 tmsg = tool |
134 tmsg = tool |
135 if pat: |
135 if pat: |
136 tmsg += " specified for " + pat |
136 tmsg = _("%s (for pattern %s)") % (tool, pat) |
137 if not _findtool(ui, tool): |
137 if not _findtool(ui, tool): |
138 if pat: # explicitly requested tool deserves a warning |
138 if pat: # explicitly requested tool deserves a warning |
139 ui.warn(_("couldn't find merge tool %s\n") % tmsg) |
139 ui.warn(_("couldn't find merge tool %s\n") % tmsg) |
140 else: # configured but non-existing tools are more silent |
140 else: # configured but non-existing tools are more silent |
141 ui.note(_("couldn't find merge tool %s\n") % tmsg) |
141 ui.note(_("couldn't find merge tool %s\n") % tmsg) |