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.

# should print nothing
# should print ? b/x
? b/x
# should print A b/x
A b/x
# should forget b/x
forgetting b/x
# should print nothing