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.

     1

#!/bin/sh

     2

# http://www.selenic.com/mercurial/bts/issue433

     3

     4

hg init a

     5

cd a       

     6

echo a > a 

     7

hg commit -Ama 

     8

     9

hg parents -r 0 doesnotexist

    10

true