tests/test-merge4
author Brendan Cully <brendan@kublai.com>
Tue, 03 Oct 2006 12:14:33 -0700
changeset 3241 a184cd0c2db9
parent 2283 e506c14382fd
permissions -rwxr-xr-x
Merge with upstream

#!/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"