##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Always remove appendopener tmp files (fixes issue235)....
Always remove appendopener tmp files (fixes issue235). test-hup triggered this bug by killing "hg serve --stdio".
Vincent Danjean - - Load All Authors

File last commit:

r1341:3ab6e55e default
r2232:ef3c039e default
Show More
hgmerge.1.txt
35 lines | 827 B | text/plain | TextLexer
/ doc / hgmerge.1.txt
History | Annotation | Raw |Copy content |Copy permalink
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).