Add hgmerge manpage -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add hgmerge manpage - From Vincent Danjean manifest hash: db96fb3109a588052b21e49df81cfe65c98e72d7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvQT2ywK+sNU5EO8RAmuFAJ0TFJ7K88OP/dMJVcFtD6Tiuon8SwCgl+W+ 4NgyQCJKwgfGF6nEhqJkgck= =Ymjz -----END PGP SIGNATURE-----

#!/bin/bash

set -x
mkdir t
cd t
hg init
echo a > a
hg add a
hg commit -t "test" -u test -d "0 0"
hg verify
hg parents
hg status
hg undo
hg verify
hg parents
hg status