tests/test-conflict
author Bryan O'Sullivan <bos@serpentine.com>
Wed, 18 Jul 2007 13:56:08 -0700
changeset 4923 e8c0b52c363c
parent 4385 93a4e72b4f83
permissions -rwxr-xr-x
Better fix for issue 622 than we had in c4dd58af0fc8.

#!/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"
hg merge 1
hg id
cat a
hg status