hgmerge(1)
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).
01/03/2007