view doc/hgmerge.1.txt @ 575:7f5ce4bbdd7b

More whitespace cleanups -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 More whitespace cleanups manifest hash: 6721a7b11295e0127386b080fd7a7b516ebced74 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxwm/ywK+sNU5EO8RAnl+AKCg/7ZCW7zIoG0nefksZzgLzgNmFACgnAFz ZkW0LyZcU/hkFgXoGwo7ktk= =AW+0 -----END PGP SIGNATURE-----
author mpm@selenic.com
date Sat, 02 Jul 2005 13:40:15 -0800
parents c084cfbb2389
children 3ab6e55ee361
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 Matt Mackall.
Free use of this software is granted under the terms of the GNU General
Public License (GPL).