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-----
+ hg init
+ echo nothing
+ hg add a
+ hg commit -t ancestor -u test -d '0 0'
+ echo something
+ hg commit -t branch1 -u test -d '0 0'
+ hg co 0
+ echo 'something else'
+ hg commit -t branch2 -u test -d '0 0'
+ export HGMERGE=merge
+ HGMERGE=merge
+ hg -d up -m 1
merge: warning: conflicts during merge
resolving manifests
ancestor 1c6e5a129854 local 35fedfab3325 remote a58017859bdc
a versions differ, resolve
working dir created .out, keeping
merging a
resolving a
file a: other d7250518cb1b ancestor 68ba9db7a9e4
merging a failed!
+ hg id
32e80765d7fe+75234512624c+ tip
+ grep -Ev '>>>|<<<' a
something else
=======
something
+ hg status
C a
? .out