Mercurial > hg
view tests/test-merge3.out @ 464:50da4bb9cab6
Merge from http://moffetthome.net:8012/
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Merge from http://moffetthome.net:8012/
manifest hash: 3a67864af6b0276eabe640274633ca2625dbd4a5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCvQKkywK+sNU5EO8RArUHAKCSGtpEfJwYGoAIpj4mBDvcPted9wCgnzML
xr8WQ8DdPkJ9DVsLjvsbhJU=
=O7Fd
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Fri, 24 Jun 2005 23:07:16 -0800 |
parents | 2fe8d66e3075 |
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 + touch b + hg add b + rm b + hg commit -A '-tcomment #1' -d '0 0' -u user b never committed!