Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge4.out @ 510:7f3fc8fd427e
More fiddling with uint32_t includes for extensions
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
More fiddling with uint32_t includes for extensions
manifest hash: 1ad16a0262e9bd2769e32c13c7fd0c7b0cd7dde7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCwS+/ywK+sNU5EO8RAhK1AKCtF/57nKCc1AU+l0sR74kHhY1NCwCfSvQK
QQc5i8abuGkFpU5VUBJt5XQ=
=H+CX
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Tue, 28 Jun 2005 03:08:47 -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