tests/test-merge4
author Matt Mackall <mpm@selenic.com>
Wed, 06 Jul 2005 22:27:25 -0800
changeset 642 5d6177b72fcc
parent 416 5e9e8b8d2629
child 749 7e4843b7efd2
permissions -rwxr-xr-x
Update tests

#!/bin/sh -x

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