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

#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "1000000 0"
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "1000000 0"
hg update 0
echo This is file c1 > c
hg add c
hg commit -m "commit #2" -d "1000000 0"
hg merge 1
rm b
echo This is file c22 > c
hg commit -m "commit #3" -d "1000000 0"