README: integrate various changes and suggestions from Rafael Villar Burke -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 README: integrate various changes and suggestions from Rafael Villar Burke manifest hash: ce1999b3ffc19c1dca582355e32e1ea9b8d108f0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCnVL+ywK+sNU5EO8RAnfRAJ9eIlaxdzExbvQUlvaofk+aWMfzUgCfTmeb 4DfwOHsb8IreNXRs00jJtJI= =mt6J -----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