hgext/largefiles/CONTRIBUTORS
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
Sat, 13 May 2017 03:28:36 +0900
changeset 32253 7d4ce4b567c5
parent 15168 cfccd3bee7b3
permissions -rw-r--r--
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.

Greg Ward, author of the original bfiles extension
Na'Tosha Bard of Unity Technologies
Fog Creek Software
Special thanks to the University of Toronto and the UCOSP program