doc/hgmerge.1.txt
author Vadim Gelfer <vadim.gelfer@gmail.com>
Sat, 04 Mar 2006 15:15:18 -0800
changeset 1914 a5bf0030df5f
parent 1341 3ab6e55ee361
child 2858 345bac2bc4ec
permissions -rw-r--r--
make --style=compact look for map-cmdline.compact. change name of key in map file from changelog to changeset. rename command map files to start with map-cmdline. rename ui.logmap to ui.style in hgrc. now --style=foo does this: tries to open foo as file. tries as map-cmdline.foo in template path. tries as foo in template path.

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