comparison hgmerge @ 280:a69c3b2957d1

Mark the usual things executable -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Mark the usual things executable manifest hash: e55dde46fd1a97ce338c1ac71278b67ca9d96bf7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpz5RywK+sNU5EO8RAnypAJwLpjrQ09nMSJUELtCondHI0fvuVACfQu2J mFi9D3L9ULGO457NWB4h3kY= =3bcD -----END PGP SIGNATURE-----
author mpm@selenic.com
date Wed, 08 Jun 2005 10:52:01 -0800
parents a2edb4481f19
children 15a9e55e7ea5 f06a4a3b86a7
comparison
equal deleted inserted replaced
279:5edd24db6dc7 280:a69c3b2957d1