Skip to content
Snippets Groups Projects
Commit 7d4ce4b5 authored by Katsunori FUJIWARA's avatar Katsunori FUJIWARA
Browse files

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.
parent d67991c4
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment