# HG changeset patch
# User mpm@selenic.com
# Date 1119683830 28800
# Node ID c084cfbb23892d5fc7a744840b5121c4317f267a
# Parent  f8cb8d082d40a06823ea387e8cc1da8edb4f94be
Add hgmerge manpage

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Add hgmerge manpage

- From Vincent Danjean

manifest hash: db96fb3109a588052b21e49df81cfe65c98e72d7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCvQT2ywK+sNU5EO8RAmuFAJ0TFJ7K88OP/dMJVcFtD6Tiuon8SwCgl+W+
4NgyQCJKwgfGF6nEhqJkgck=
=Ymjz
-----END PGP SIGNATURE-----


diff -r f8cb8d082d40 -r c084cfbb2389 doc/hgmerge.1.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/hgmerge.1.txt	Fri Jun 24 23:17:10 2005 -0800
@@ -0,0 +1,35 @@
+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).