Mercurial > hg-stable
diff hgmerge @ 1773:aae93c3bffb4
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 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