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