Mercurial 0.5 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Mercurial 0.5 Update version numbers Fixup MANIFEST.in manifest hash: 58db9be35685e83133f20e96265d6c434fc106c2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCmOwHywK+sNU5EO8RAq0OAKCkMWzSMzhisTFBmT2WLj2bf+PMqwCbBv+S jNvqIQsru2JMdCQC2eG7CxU= =c20j -----END PGP SIGNATURE-----

set -ex
export EDITOR=true
rm -rf test branch

mkdir test
cd test
echo foo>foo
hg init
hg addremove
hg commit
hg verify
cd ..

cp -a test branch
cd branch
echo bar>>foo
hg commit

cd ../test
hg merge ../branch
hg verify