diff hgmerge @ 657:22bc6fb9aefc

dirstate.forget() takes a list -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 dirstate.forget() takes a list manifest hash: e444474a5ac76d3562ee8c0211e1a88ec53155ef -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFC0WO+ywK+sNU5EO8RAlmYAJ9pcSgpvvuqLzfUkeApXZyOb3j6pQCgi9Te e8ZI236WNWfyrwEASxFIeLM= =yDVZ -----END PGP SIGNATURE-----
author Matt Mackall <mpm@selenic.com>
date Sun, 10 Jul 2005 10:06:54 -0800
parents 4fc63e22b1fe
children cd0ad12d9e42 8f5637f0a0c0 0902ffece4b4
line wrap: on
line diff