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.
checking changesetschecking manifestscrosschecking files in changesets and manifestschecking files0 files, 0 changesets, 0 total revisions