A bunch of parsing/help updates
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
A bunch of parsing/help updates
more explanation of how to get non-basic commands
shorten names of debug functions and add docstrings
add undo long docstring
promote anotate, export, and revert
make the global opts array global
refactor parsing
kill two unused arguments to fancyopts
update test-help
manifest hash:
459ae2273aaf54f71b4576677a681dc53ab2908c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCyEDhywK+sNU5EO8RAr0DAJ9LTu8Fc2quLRtuwLPTQzWqlOJWKwCbBpZk
pnMkYnshsutVYljcil1P46I=
=Sleg
-----END PGP SIGNATURE-----
HGMERGE(1)
==========
Matt Mackall <mpm@selenic.com>
v0.1, 27 May 2005
NAME
----
hgmerge - default wrapper to merge files in Mercurial SCM system
SYNOPSIS
--------
'hgmerge' local ancestor remote
DESCRIPTION
-----------
The hgmerge(1) command provides a graphical interface to merge files in the
Mercurial system. It is a simple wrapper around kdiff3, merge(1) and tkdiff(1),
or simply diff(1) and patch(1) depending on what is present on the system.
hgmerge(1) is used by the Mercurial SCM if the environment variable HGMERGE is
not set.
AUTHOR
------
Written by Vincent Danjean <Vincent.Danjean@free.fr>
SEE ALSO
--------
hg(1) - the command line interface to Mercurial SCM
COPYING
-------
Copyright (C) 2005 Matt Mackall.
Free use of this software is granted under the terms of the GNU General
Public License (GPL).