##// END OF EJS Templates
run-tests.py: pass -L/--label to simplemerge...
run-tests.py: pass -L/--label to simplemerge This should give us conflict markers that don't change from one run to another. Remove some sed's/egrep's from some tests.

File last commit:

r910:891b6a26 merge default
r4387:93a4e72b default
Show More
test-notfound
9 lines | 201 B | text/plain | TextLexer
#!/bin/sh
hg init
echo "Is there an error message when trying to diff non-existing files?"
hg diff not found
echo "Is there an error message when trying to add non-existing files?"
hg add not found