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
# http://www.selenic.com/mercurial/bts/issue433

hg init a
cd a       
echo a > a 
hg commit -Ama 

hg parents -r 0 doesnotexist
true