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.
Showing
- mercurial/filemerge.py 5 additions, 2 deletionsmercurial/filemerge.py
- tests/test-merge-changedelete.t 5 additions, 10 deletionstests/test-merge-changedelete.t
- tests/test-merge-tools.t 6 additions, 12 deletionstests/test-merge-tools.t
- tests/test-merge-types.t 2 additions, 2 deletionstests/test-merge-types.t
Loading
Please register or sign in to comment