view tests/test-merge4 @ 456:d6ac88a738c4

More FAQ bits. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 More FAQ bits. manifest hash: dd8aa534d3e72aa33f4fd7270d3750cefc2c40a9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCu54aywK+sNU5EO8RAud5AJ4699rQiuiZ2TKdZzkG6iGU/UaG8wCgr4Jz euPp7E7arLNoOYtzCbGCSks= =l3sX -----END PGP SIGNATURE-----
author mpm@selenic.com
date Thu, 23 Jun 2005 21:46:02 -0800
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