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
hg init a
cd a
hg init b
echo x > b/x
echo '# should print nothing'
hg st
echo '# should print ? b/x'
hg st b/x
hg add b/x
echo '# should print A b/x'
hg st
echo '# should forget b/x'
hg revert --all
echo '# should print nothing'
hg st b