doc/hgmerge.1.txt
author Thomas Arendsen Hein <thomas@intevation.de>
Sun, 26 Jun 2005 14:14:04 +0100
changeset 479 7293cb91bf2a
parent 466 c084cfbb2389
child 1341 3ab6e55ee361
permissions -rw-r--r--
Cleaned up command alias handling in help. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Cleaned up command alias handling in help. manifest hash: cfff5b739437073beddbc6e1f4c47ca958eeb1b2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCvqocW7P1GVgWeRoRAkM/AJ9iXHfhyAJH8kL167OiG95EJSsAKwCfWZFt 5S2AiXffxtPLIzxb/evzHZQ= =ppvs -----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).