NAME
hgmerge - default wrapper to merge files in Mercurial
SCM system
SYNOPSIS
hgmerge local ancestor remote.sp
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..sp hgmerge(1) is
used by the Mercurial SCM if the environment variable HGMERGE is
not set..sp
AUTHOR
Written by Vincent Danjean <Vincent.Danjean@free.fr>.sp
SEE ALSO
hg(1) - the
command line interface to Mercurial SCM.sp
COPYING
Copyright (C) 2005, 2006 Matt Mackall. Free use of
this software is granted under the terms of the GNU General Public
License (GPL)..sp