Mercurial > hg > mercurial-crew-with-dirclash

diff hgmerge @ 1773:aae93c3bffb4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgmerge: improve "apps not found" message
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
date Tue, 21 Feb 2006 15:48:19 -0600
parents b1a7fd503a29
children ac7b91bcbd8d
line wrap: on
line diff
--- a/hgmerge
+++ b/hgmerge
@@ -155,5 +155,9 @@ if [ -n "$DIFF" -a -n "$PATCH" ]; then
     failure
 fi
 
-echo "hgmerge: unable to find merge, tkdiff, kdiff3, or diff+patch!"
+echo
+echo "hgmerge: unable to find any merge utility!"
+echo "supported programs:"
+echo "merge, FileMerge, tkdiff, kdiff3, diff+patch"
+echo
 failure