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/sh +ex
mkdir test1
cd test1
hg init
touch a b
hg add a b
hg ci -t "added a b" -u test -d "0 0"
cd ..
mkdir test2
cd test2
hg init
hg merge ../test1
hg co
chmod +x a
hg ci -t "chmod +x a" -u test -d "0 0"
cd ../test1
echo 123 >>a
hg ci -t "a updated" -u test -d "0 0"
hg merge ../test2
hg heads
hg history
hg -dv co -m
ls -l ../test[12]/a > foo
cut -b 0-10 < foo