contrib/debian/hgkpath.rc
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
Sat, 13 May 2017 03:28:36 +0900
changeset 32253 7d4ce4b567c5
parent 26299 79e1064f7c5e
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:
26299
79e1064f7c5e debian: install hgk as part of mercurial-common (issue4829)
Augie Fackler <augie@google.com>
parents:
diff changeset
     1
[hgk]
79e1064f7c5e debian: install hgk as part of mercurial-common (issue4829)
Augie Fackler <augie@google.com>
parents:
diff changeset
     2
path = /usr/share/mercurial/hgk