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 -v log -v
hg -v log -v x
true