comparison hgmerge @ 352:ca39b80cbe15

ignore files associated with quilt -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 ignore files associated with quilt manifest hash: f0da2c0465fb27005d5bde30e0171ae9a76951d0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsGpIywK+sNU5EO8RAi+uAJ4/cXWFBnXoLHH8bN8Xbe/nzXHycgCfQkO2 WdEoWI4YpiNQ+s5id6Xxphw= =6cXJ -----END PGP SIGNATURE-----
author mpm@selenic.com
date Wed, 15 Jun 2005 09:50:00 -0800
parents f06a4a3b86a7
children 3d4d5f2aba9a 4fc63e22b1fe
comparison
equal deleted inserted replaced
351:9525208e1c1d 352:ca39b80cbe15