-->


MAN Solaris - HGMERGE (1)

advertisement


NAME

hgmerge - default wrapper to merge files in Mercurial SCM system

CONTENTS

Notes

SYNOPSIS

hgmerge local ancestor remote

advertisements

advertisements


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

ATTRIBUTES

See attributes(5) for descriptions of the following attributes:

ATTRIBUTE TYPEATTRIBUTE VALUE
AvailabilitySUNWmercurial
Interface StabilityVolatile

NOTES

Source for Mercurial is available on http://opensolaris.org.
Jump to page    or go to Top of page |  Section 1 |  Main Solaris Index.


SunOS 5.10 HGMERGE (1) 10/19/2007
Generated by Open Solaris Forum from /usr/share/man/man1/hgmerge.1 using man macros with tbl support.