[PATCH 2] ChangeLog template conformance fixes. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH 2] ChangeLog template conformance fixes. From: Edouard Gomez <edouard.gomez@gmail.com> # HG changeset patch # User ed.gomez@free.fr # Node ID e0661b00c613fa2bf1b670db1c9097423b4a107f # Parent b2e9146c237d84a1dd24af9a08bfb031bcc3a523 ChangeLog template conformance fixes. As per: http://www.w3.org/TR/html401/interact/forms.html#h-17.3 form element MUST have action attribute As per: http://www.w3.org/TR/html401/interact/forms.html#h-17.4 input has no length attribute, replace by size (i don't couple this with maxlength because a tag may be used in future versions and no length limit might be required ?). manifest hash: c8dccb4805167a47f159094fc5f57500caec4951 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCx1fdywK+sNU5EO8RAliGAJ4iBaSn2D9rRXVmreEYUwNvDyxMlQCeLxMU HcVHU0wRJDAbiXngOINk7GA= =FyPC -----END PGP SIGNATURE-----

#!/bin/sh

set -x
hg init
echo "nothing" > a
hg add a
hg commit -t ancestor -u test -d "0 0"
echo "something" > a
hg commit -t branch1 -u test -d "0 0"
hg co 0
echo "something else" > a
hg commit -t branch2 -u test -d "0 0"
export HGMERGE=merge
hg -d up -m 1
hg id
grep -Ev ">>>|<<<" a
hg status