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.
#!/bin/sh
mkdir a
cd a
hg init
echo foo > b
hg add b
hg ci -m "b" -d "1000000 0"
chmod -w .hg/store
cd ..
hg clone a b
chmod +w a/.hg/store # let test clean up
cd b
hg verify