##// 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:

r3853:c0b44915 default
r4387:93a4e72b default
Show More
test-requires.out
2 lines | 93 B | text/plain | TextLexer
abort: index 00changelog.i unknown format 2!
abort: requirement 'indoor-pool' not supported!