Mercurial > hg

view doc/hgmerge.1.txt @ 5089:9b5ae133bd5a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-no-symlinks: rename .bundle into .hg for consistency.
author Patrick Mezard <pmezard@gmail.com>
date Thu, 09 Aug 2007 23:14:50 +0200
parents 63b9d2deed48
children
line wrap: on
line source

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