view tests/test-merge4 @ 741:156dc2f3be7f

Fix some line wrapping manifest hash: 43af5dafa55e01f89727096f4d6784317f3eb0d6
author mpm@selenic.com
date Wed, 20 Jul 2005 20:11:23 -0500
parents 5e9e8b8d2629
children 7e4843b7efd2
line wrap: on
line source

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