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
set -x
hg init
echo "nothing" > a
hg add a
hg commit -t ancestor -u test -d "0 0"
echo "something" > a
hg commit -t branch1 -u test -d "0 0"
hg co 0
echo "something else" > a
hg commit -t branch2 -u test -d "0 0"
export HGMERGE=merge
hg -d up -m 1
hg id
grep -Ev ">>>|<<<" a
hg status