doc/hgmerge.1.txt
author Patrick Mezard <pmezard@gmail.com>
Wed, 10 Jan 2007 20:35:27 +0100
changeset 4023 6ea8a3b805ee
parent 2858 345bac2bc4ec
child 4635 63b9d2deed48
permissions -rw-r--r--
Flush stderr after write. stderr can be buffered under win32 when redirected to a file, including stdout.

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