diff hgmerge @ 577:5291a16324c0

Remove -p global switch in preparation for combining namespaces -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Remove -p global switch in preparation for combining namespaces manifest hash: 88b5d17097aababa5c2c9242deba51598b207e3c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxyR/ywK+sNU5EO8RAvPbAJ0XtMA5E1y71hrx9ahBxU3sys98LwCghnz/ xks9tYPTnG8aizwEmg68EGw= =5MkD -----END PGP SIGNATURE-----
author mpm@selenic.com
date Sat, 02 Jul 2005 15:34:23 -0800
parents 4fc63e22b1fe
children cd0ad12d9e42 8f5637f0a0c0 0902ffece4b4
line wrap: on
line diff