README: integrate some changes from Kevin Smith -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 README: integrate some changes from Kevin Smith manifest hash: 7e3ca4be07fe9df4348d21b42771696a357c23d8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCnVhfywK+sNU5EO8RAtXvAJ4oclpYQm98YArUDbs7ZUfQspQpcACZAXf2 pMG7GKkquua+fS76uxpcCgs= =yPbJ -----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