view tests/test-conflict @ 2703:d32b31e88391

run-tests.py: fix diff output when test-foo.out doesn't exist.

Previously, if test-foo.out doesn't exist and test-foo outputs
something, the first line of the diff will look like this:

-+changeset:   0:0acdaf898367

(note the leading "-")

#!/bin/sh

hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "1000000 0"
echo "something" > a
hg commit -m branch1 -d "1000000 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "1000000 0"
HGMERGE=merge; export HGMERGE
hg merge 1
hg id
egrep -v ">>>|<<<" a
hg status