Add COPYING -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add COPYING manifest hash: 7ca259e873d941d922b46c7fbf39696e258149ce -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCswkdywK+sNU5EO8RAtB9AKCrG7JLOFwEKLjr/TwdvcqjjHmzJQCfcFUK lBazBFg3F2G3knOABzuSqPA= =i2Qb -----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