comparison hgmerge @ 331:55f63f3b6a54

Add a simple testing framework -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add a simple testing framework manifest hash: 9eeea72f2f33438040998a190183958764232ece -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCr0wKywK+sNU5EO8RAl9FAJ4o1QUA/YE2hCSlUPngR8h30hT1xQCgoEhu um2QkJOc2Rz7i6xTGPxuqzU= =YyUM -----END PGP SIGNATURE-----
author mpm@selenic.com
date Tue, 14 Jun 2005 13:28:42 -0800
parents f06a4a3b86a7
children 3d4d5f2aba9a 4fc63e22b1fe
comparison
equal deleted inserted replaced
330:27d08c0c2a7e 331:55f63f3b6a54