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/shhg initecho This is file a1 > ahg add ahg commit -m "commit #0" -d "1000000 0"touch bhg add brm bhg commit -A -m"comment #1" -d "1000000 0"