view tests/test-merge4 @ 595:c2c2c6d617bd

Expand undo docs -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Expand undo docs manifest hash: 4381a35ef96ce10176dde3c9c6c2503f65ae8a09 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyD93ywK+sNU5EO8RAianAJ97+hYOTwV3OvAAekcYn3f1Ahzf4ACeLjgz kUAHrjSmhs2F421lXxbgCfw= =gbg9 -----END PGP SIGNATURE-----
author mpm@selenic.com
date Sun, 03 Jul 2005 11:41:43 -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