unknown command fixups -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 unknown command fixups from Andrew Thompson manifest hash: 3ed1956585a905a52d93491ea95096be23c9acf8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpVTaywK+sNU5EO8RAkvLAJ0ff8/kVQc93jGy5t1uJ5R8m0M4OACfZ1Ba O7CldaLkwEzqybw/5iL6NAw= =WGtU -----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