view tkmerge @ 238:3b92f8fe47ae

hgweb.py: kill #! line, clean up copyright notice -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb.py: kill #! line, clean up copyright notice manifest hash: a2910abe3f58687ccf55179ab37f66dee2b6e775 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoM71ywK+sNU5EO8RAil4AJ9edZ1FJ0WbikVBYBMNO+MldBRqnACfRtuH Nw/BuBueQfEhaI3i+9+Q9/g= =vV8+ -----END PGP SIGNATURE-----
author mpm@selenic.com
date Fri, 03 Jun 2005 13:43:17 -0800
parents 9117c6561b0b
children
line wrap: on
line source

merge $1 $3 $2 || tkdiff -conflict $1 -o $1