test-help: hg copy now shows up in the help -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 test-help: hg copy now shows up in the help manifest hash: f5a8f55f2e87e363c22e1639eef4a919ed028d4e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsMCTywK+sNU5EO8RAg0UAKCtCVRkgxqjfHGIbaz1DTZ+FJgXdQCgrfkq i4W+etRh5HWatXrjw+n7Ppk= =4lE7 -----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
cat a | grep -v ">>>" | grep -v "<<<"
hg status