##// END OF EJS Templates
filemerge: show warning about choice of :prompt only at an actual fallback...
filemerge: show warning about choice of :prompt only at an actual fallback Before this patch, internal merge tool :prompt shows "no tool found to merge FILE" line, even if :prompt is explicitly specified as a tool to be used. This patch shows warning message about choice of :prompt only at an actual fallback, in which case any tool is rejected by capability for binary or symlink. It is for backward compatibility to omit warning message in "changedelete" case.

File last commit:

r28809:7a1ad08b default
r32253:7d4ce4b5 default
Show More
test-gendoc-fr.t
4 lines | 84 B | text/troff | Tads3Lexer
#require docutils gettext
$ $TESTDIR/check-gendoc fr
checking for parse errors