Show More
@@ -155,5 +155,9 b' if [ -n "$DIFF" -a -n "$PATCH" ]; then' | |||
|
155 | 155 | failure |
|
156 | 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 | 163 | failure |
General Comments 0
You need to be logged in to leave comments.
Login now