tests/test-merge4.out
author mpm@selenic.com
Thu, 30 Jun 2005 23:21:09 -0800
changeset 539 44b29b98254a
parent 416 5e9e8b8d2629
child 749 7e4843b7efd2
permissions -rw-r--r--
Minor hgweb fixup for new diff code -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Minor hgweb fixup for new diff code manifest hash: a80a817fa1511c6ea76f07b2e03691539c19de55 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxO7lywK+sNU5EO8RArAkAJ49Piw1lKwhno5XtTdE0J2B3KIeJQCgpeZW JbFuy/zzo2e45xu6Uez8CMw= =sQOB -----END PGP SIGNATURE-----

+ 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