Show More
| @@ -133,7 +133,7 def _picktool(repo, ui, path, binary, sy | |||
|
|
133 | 133 | def check(tool, pat, symlink, binary, changedelete): |
|
|
134 | 134 | tmsg = tool |
|
|
135 | 135 | if pat: |
|
|
136 |
tmsg |
|
|
|
136 | tmsg = _("%s (for pattern %s)") % (tool, pat) | |
|
|
137 | 137 | if not _findtool(ui, tool): |
|
|
138 | 138 | if pat: # explicitly requested tool deserves a warning |
|
|
139 | 139 | ui.warn(_("couldn't find merge tool %s\n") % tmsg) |
| @@ -392,9 +392,9 merge-patterns specifies executable not | |||
|
|
392 | 392 | true.executable=cat |
|
|
393 | 393 | # hg update -C 1 |
|
|
394 | 394 | $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistentmergetool |
|
|
395 |
couldn't find merge tool true |
|
|
|
395 | couldn't find merge tool true (for pattern f) | |
|
|
396 | 396 | merging f |
|
|
397 |
couldn't find merge tool true |
|
|
|
397 | couldn't find merge tool true (for pattern f) | |
|
|
398 | 398 | merging f failed! |
|
|
399 | 399 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
|
400 | 400 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
| @@ -418,9 +418,9 merge-patterns specifies executable with | |||
|
|
418 | 418 | true.executable=cat |
|
|
419 | 419 | # hg update -C 1 |
|
|
420 | 420 | $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexistent/mergetool |
|
|
421 |
couldn't find merge tool true |
|
|
|
421 | couldn't find merge tool true (for pattern f) | |
|
|
422 | 422 | merging f |
|
|
423 |
couldn't find merge tool true |
|
|
|
423 | couldn't find merge tool true (for pattern f) | |
|
|
424 | 424 | merging f failed! |
|
|
425 | 425 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
|
426 | 426 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
General Comments 0
You need to be logged in to leave comments.
Login now