doc/hgmerge.1.txt
author kreijack@inwind.REMOVEME.it
Wed, 06 Jul 2005 22:28:50 -0800
changeset 645 a55048b2ae3a
parent 466 c084cfbb2389
child 1341 3ab6e55ee361
permissions -rw-r--r--
this patch permits hgweb to show the deleted files in the changeset diff # HG changeset patch # User kreijack@inwind.REMOVEME.it # Node ID 08b33970007e753f12b2b2f9d0e169981a6e8c3c # Parent 7369ec5d93f2ffd490a43970edd9adf8d2bbe269 this patch permits hgweb to show the deleted files in the changeset diff

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