# HG changeset patch
# User Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
# Date 1140558499 21600
# Node ID aae93c3bffb4e3a80363d5513c62e8bb4ddc1197
# Parent  b1a7fd503a29e6f9b71285b1d9795ab392607821
hgmerge: improve "apps not found" message



diff -r b1a7fd503a29 -r aae93c3bffb4 hgmerge
--- a/hgmerge	Tue Feb 21 15:48:16 2006 -0600
+++ b/hgmerge	Tue Feb 21 15:48:19 2006 -0600
@@ -155,5 +155,9 @@
     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