view tests/test-merge4.out @ 449:df83b2c306ac

Cleaned up some asciidoc bits in the FAQ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Cleaned up some asciidoc bits in the FAQ manifest hash: d21d57210696587dbb6a30a711f77612ed20f40e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuzPpywK+sNU5EO8RAm6JAJ4kgJKyU2v0e/TL3elPWt+8IiN+2wCeKwVa iaJSNgsrzdNmNhhlzaQ267c= =A8Xr -----END PGP SIGNATURE-----
author mpm@selenic.com
date Thu, 23 Jun 2005 14:12:57 -0800
parents 5e9e8b8d2629
children 7e4843b7efd2
line wrap: on
line source

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