Better messages for rollback and undo
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Better messages for rollback and undo
manifest hash: 22eeb8848b0e07e1f23a896b03c37f7d6f4bd82d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCwSBtywK+sNU5EO8RAhNEAJ9MGJxgZjIKegh1TA7++wGbAzkovACgqL3I
k1ii4X5PEWEDcoyOp0VqJn4=
=wzlT
-----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