doc/hgmerge.1.txt
author Dennis Schoen <ds@1d10t.de>
Mon, 31 Dec 2007 16:18:17 +0100
changeset 5819 89ea99c7bdfd
parent 4635 63b9d2deed48
permissions -rw-r--r--
patchbomb: attachment options changed '-a/--attach' send patches as attachment '-i/--inline' sends patches as inline attachment (old behavior of -a/--attach)

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-2007 Matt Mackall.
Free use of this software is granted under the terms of the GNU General
Public License (GPL).