Fix up test-merge1
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix up test-merge1
The third test was wrong and showed up after fixing the typo in
compare code
manifest hash: 306ab9936457ad90e7c7a226d6407ca586262650
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCuPH8ywK+sNU5EO8RAql+AJsH/bxFMTMbUiaEoLNhXS6wNkzLAgCfQxDJ
3j5pZ3MzrtPD0y4wC3vIAA4=
=VKEy
-----END PGP SIGNATURE-----
#!/bin/bash
set -ex
mkdir test
cd test
echo foo>foo
hg init
hg addremove
hg commit -t "1"
hg verify
cd ..
mkdir branch
cd branch
hg init ../test
hg co
echo bar>>foo
hg commit -t "2"
cd ../test
hg pull ../branch
hg verify
hg co
cat foo
hg manifest