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

r2152:57729c56 default
r4387:93a4e72b default
Show More
test-empty.out
5 lines | 143 B | text/plain | TextLexer
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
0 files, 0 changesets, 0 total revisions