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-----
+ hg init
+ echo a
+ hg add a
+ hg commit -t test -u test -d '0 0'
+ hg history
changeset: 0:acb14030fe0a21b60322c440ad2d20cf7685a376
tag: tip
user: test
date: Thu Jan 1 00:00:00 1970
summary: test
+ hg tag -u test -d '0 0' bleah
+ hg history
changeset: 1:863197ef03781c4fc00276d83eb66c4cb9cd91df
tag: tip
user: test
date: Thu Jan 1 00:00:00 1970
summary: Added tag bleah for changeset acb14030fe0a21b60322c440ad2d20cf7685a376
changeset: 0:acb14030fe0a21b60322c440ad2d20cf7685a376
tag: bleah
user: test
date: Thu Jan 1 00:00:00 1970
summary: test
+ echo foo
+ hg tag -u test -d '0 0' bleah2
abort: working copy of .hgtags is changed!
(please commit .hgtags manually)
+ echo failed
failed