Fixed test for previous change of 'hg -v history'.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fixed test for previous change of 'hg -v history'.
manifest hash: 5a7d918645596751577b95d0dfba28fd70274b48
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFCwOjDW7P1GVgWeRoRAvL7AJwO27B6qhOZZC+16SPjIxJBKz3BSwCghmkB
OMzLY0CjZSHixF5xs0ZU6Dw=
=F04F
-----END PGP SIGNATURE-----
#!/bin/bash
export HGMERGE=true
set -ex
mkdir r1
cd r1
hg init
echo a > a
hg addremove
hg commit -t "1" -u test -d "0 0"
hg clone . ../r2
cd ../r2
hg up
echo abc > a
hg diff > ../d
sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d
cd ../r1
echo b > b
echo a2 > a
hg addremove
hg commit -t "2" -u test -d "0 0"
cd ../r2
hg -q pull ../r1
hg status
hg -d up
hg -d up -m
hg parents
hg -v history
hg diff > ../d
sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d