Show More
@@ -32,8 +32,11 b' def _picktool(repo, ui, path, binary, sy' | |||
|
32 | 32 | tmsg = tool |
|
33 | 33 | if pat: |
|
34 | 34 | tmsg += " specified for " + pat |
|
35 |
if |
|
|
36 | ui.warn(_("couldn't find merge tool %s\n") % tmsg) | |
|
35 | if not _findtool(ui, tool): | |
|
36 | if pat: # explicitly requested tool deserves a warning | |
|
37 | ui.warn(_("couldn't find merge tool %s\n") % tmsg) | |
|
38 | else: # configured but non-existing tools are more silent | |
|
39 | ui.note(_("couldn't find merge tool %s\n") % tmsg) | |
|
37 | 40 | elif symlink and not _toolbool(ui, tool, "symlink"): |
|
38 | 41 | ui.warn(_("tool %s can't handle symlinks\n") % tmsg) |
|
39 | 42 | elif binary and not _toolbool(ui, tool, "binary"): |
@@ -71,8 +74,8 b' def _picktool(repo, ui, path, binary, sy' | |||
|
71 | 74 | tools.insert(0, (None, uimerge)) # highest priority |
|
72 | 75 | tools.append((None, "hgmerge")) # the old default, if found |
|
73 | 76 | for p,t in tools: |
|
74 | toolpath = _findtool(ui, t) | |
|
75 | if toolpath and check(t, None, symlink, binary): | |
|
77 | if check(t, None, symlink, binary): | |
|
78 | toolpath = _findtool(ui, t) | |
|
76 | 79 | return (t, '"' + toolpath + '"') |
|
77 | 80 | # internal merge as last resort |
|
78 | 81 | return (not (symlink or binary) and "internal:merge" or None, None) |
General Comments 0
You need to be logged in to leave comments.
Login now