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/issue352
hg init foo
cd foo
A=`printf 'he\rllo'`
echo foo > "$A"
hg add
hg ci -A -m m
rm "$A"
echo foo > "hell
o"
hg add
hg ci -A -m m
echo foo > "$A"
hg debugwalk
exit 0