view tests/test-merge4.out @ 472:aa3d592df9b9

extensions: use stdint.h -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 extensions: use stdint.h Not sure why I didn't do this the first time around. Hopefully still builds everywhere. manifest hash: 965582286a190728f8cc0dfb8e11ee56628a59a5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvfRgywK+sNU5EO8RAg9SAJ4/ZVpQZcDY5xovLDTZK2txEegEgwCdF2b+ lzSIP109qq8D+KIdUWsbEPc= =+0Yy -----END PGP SIGNATURE-----
author mpm@selenic.com
date Sat, 25 Jun 2005 16:18:40 -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