comparison hgweb.cgi @ 242:a2edb4481f19

hgmerge: use diff3 if available -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgmerge: use diff3 if available diff3 may be more readily available than merge manifest hash: 67a314ac42aa78410d64a6c3d36c2d575a588533 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoRUtywK+sNU5EO8RAmFPAJ0aN8VNvN9zpE/zov6wT3M98vGfDwCfXEOk xZlQHYIGrCLOFQiCQxIfr7I= =Asv9 -----END PGP SIGNATURE-----
author mpm@selenic.com
date Fri, 03 Jun 2005 18:42:53 -0800
parents e875a0cf7f3a
children 5f65a108a559
comparison
equal deleted inserted replaced
241:afe895fcc0d0 242:a2edb4481f19