doc/hgmerge.1.txt
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 29 Jul 2005 14:49:04 +0100
changeset 794 cdf61d3d39047f57269f76e54c14e3d9125e69a0
parent 466 c084cfbb23892d5fc7a744840b5121c4317f267a
child 1341 3ab6e55ee361864b9454aba3d597d2504f3ebda7
permissions -rw-r--r--
Ignore test error files, protect dot in .pc/

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