Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
1772:b1a7fd503a29 | 1773:aae93c3bffb4 |
---|---|
153 test -s "$LOCAL.rej" || success | 153 test -s "$LOCAL.rej" || success |
154 fi | 154 fi |
155 failure | 155 failure |
156 fi | 156 fi |
157 | 157 |
158 echo "hgmerge: unable to find merge, tkdiff, kdiff3, or diff+patch!" | 158 echo |
159 echo "hgmerge: unable to find any merge utility!" | |
160 echo "supported programs:" | |
161 echo "merge, FileMerge, tkdiff, kdiff3, diff+patch" | |
162 echo | |
159 failure | 163 failure |