tests/test-merge4
author Eric Hopper <hopper@omnifarious.org>
Mon, 06 Mar 2006 08:47:16 -0800
changeset 1929 85daa4e03b4c
parent 814 0902ffece4b4
child 1933 7544700fd931
permissions -rwxr-xr-x
Merging with crew.

#!/bin/sh

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