Add 'local' tags -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add 'local' tags Local tags are repository-private tags that override the usual tags. They're not version controlled. manifest hash: cce27c853d36f03adba4bd543a37c8faf1a0c749 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCu3SSywK+sNU5EO8RAlVAAJ9sTyIW2EkzBPSPp+3uU6a+6DUC6QCcD0vE jiwqhtfCuvG5LLs54LkzamY= =D9IP -----END PGP SIGNATURE-----

#!/bin/bash

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