hgmerge
changeset 1773 aae93c3bffb4
parent 1772 b1a7fd503a29
child 1774 ac7b91bcbd8d
--- 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