mpm@selenic.com [Fri, 03 Jun 2005 18:27:55 -0800] rev 240
Replace tkmerge with hgmerge
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Replace tkmerge with hgmerge
hgmerge attempts to find and use merge, kdiff3, tkmerge, and diff+patch.
hg will use hgmerge unless overridden with HGMERGE
manifest hash: 9137a620df4b235e66343b0fd0dba87fe631546e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCoRGrywK+sNU5EO8RAi2VAJ9bh97ChGJymP/p8rvCuyNAMnk1bQCgrIGP
vYI6qlyWKQZ01ObUTAIg92o=
=+mRH
-----END PGP SIGNATURE-----
mpm@selenic.com [Fri, 03 Jun 2005 13:44:34 -0800] rev 239
mdiff.py: kill #! line, add copyright notice
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
mdiff.py: kill #! line, add copyright notice
manifest hash: acb4e14d5947d0fde5b89a874af0476773ee1cee
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCoM9CywK+sNU5EO8RAizVAJ41dqQxxx8nouBxJMcFmoVRRo4GfACbB9RV
Xc0cqaoPVL7p87opPKjgNWw=
=HyjH
-----END PGP SIGNATURE-----
mpm@selenic.com [Fri, 03 Jun 2005 13:43:17 -0800] rev 238
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-----
mpm@selenic.com [Fri, 03 Jun 2005 13:32:37 -0800] rev 237
Merge from tah
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 02 Jun 2005 09:23:44 +0100] rev 236
Removed extra closing brace from date string.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 02 Jun 2005 09:14:12 +0100] rev 235
Obfuscate author in all HTML templates.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 02 Jun 2005 07:06:29 +0100] rev 234
ui.warn can use more than one argument like the other ui methods.