Fix default values and add interactive setting to [ui] section of hgrc docs.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix default values and add interactive setting to [ui] section of hgrc docs.
manifest hash: 211eea218970b45b2a0cdc822d5b6610a89ffbd7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC1pE8W7P1GVgWeRoRAof+AJ4mpm3DCRqh+9To3Gn4bpC7UGcTnQCfVIWN
5VT9pqdP6/06tH8nYgW55f4=
=uNyy
-----END PGP SIGNATURE-----
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).