diff tests/test-merge2 @ 574:af7e21f3b2d9

Update test-diffdir output -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Update test-diffdir output manifest hash: cd0fb3a3708897fe959852c48de1804fb0b74bf4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxwmcywK+sNU5EO8RAlRCAJ9SBrMQLSRVY1j3V1YO25dGbIN18QCfTbHJ 6/4+xEBX2j3VxUf1g3ayce8= =kcDR -----END PGP SIGNATURE-----
author mpm@selenic.com
date Sat, 02 Jul 2005 13:39:40 -0800
parents feadc9697b43
children 7e4843b7efd2
line wrap: on
line diff