doc/hgmerge.1.txt
author Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl>
Sun, 10 Jul 2005 16:00:49 -0800
changeset 665 40fd5722c669
parent 466 c084cfbb2389
child 1341 3ab6e55ee361
permissions -rw-r--r--
hgeditor: Remove temporary files even if interrupted # HG changeset patch # User Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl> # Node ID 1292f1fd015767d9682ba2ff5f8377fb6760c3a5 # Parent a4c688c8273e392b1bf33cfc736e00ec752a415e hgeditor: Remove temporary files even if interrupted Index: hg/hgeditor ===================================================================

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