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.
changeset: 0:9c2cf2b35aa7
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: add foo
changeset: 1:3756a9556b89
tag: tip
user: test
date: Mon Jan 12 13:46:41 1970 +0000
summary: change foo
2 revisions:
9c2cf2b35aa7
3756a9556b89