doc/hgmerge.1.txt
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 06 Sep 2006 02:15:33 +0200
changeset 3061 fe5c92529d1c
parent 2858 345bac2bc4ec
child 4635 63b9d2deed48
permissions -rw-r--r--
hgk.py: fix warnings from pychecker - unused variables - usage of undefined variables (opts and filterfiles)

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