comparison mercurial/pathutil.py @ 32253:7d4ce4b567c5

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.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Sat, 13 May 2017 03:28:36 +0900
parents cfe66dcf45c0
children 456626e9c3d1 20bac46f7744
comparison
equal deleted inserted replaced
32252:d67991c4fefe 32253:7d4ce4b567c5