Tweak README for branch, push, and .hgrc -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Tweak README for branch, push, and .hgrc manifest hash: f1937ad49013e7e40e6555f2acf1210563e6a96d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCrhBSywK+sNU5EO8RAr0OAJ9T+DcMcIvXp9ajI46kXM40GuHosgCfRxfY 8uhwZqdaR0JWlWff0nC6t1Y= =3I60 -----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