doc/hgmerge.1.txt
author Matt Mackall <mpm@selenic.com>
Mon, 11 Jul 2005 21:56:29 -0800
changeset 684 4ccf3de52989
parent 466 c084cfbb2389
child 1341 3ab6e55ee361
permissions -rw-r--r--
Turn off signing with hgeditor by default manifest hash: f2732475351ee22d78e0dab629db03f1f215b21f

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).