Mercurial Mercurial > hg / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
contrib/win32/mercurial.ico
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
Sat, 13 May 2017 03:28:36 +0900
changeset 32253 7d4ce4b567c5
parent 7659 25ac72ca68f6
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.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7659
25ac72ca68f6 Add Lee Cantey's installer icon to win32 installer
Pascal Quantin <pascal.quantin@wavecom.com>
parents:
diff changeset 
     1
 
(binary:image/vnd.microsoft.icon)
Mercurial