diff hgmerge @ 524:230676d0df6f

Fix up test-bad-pull output -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix up test-bad-pull output manifest hash: 4ed6670e4f20a0ad9e5b483ccc3003e8bd5c094c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwxwdywK+sNU5EO8RAm4RAJ9MuISeQhLqfxo4/w3WLjk18y6gXwCeMwCf 4nvEMnJCPMyk4MSMfzPnCnQ= =wAOy -----END PGP SIGNATURE-----
author mpm@selenic.com
date Wed, 29 Jun 2005 14:09:33 -0800
parents f06a4a3b86a7
children 3d4d5f2aba9a 4fc63e22b1fe
line wrap: on
line diff