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

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

Revert changeset 120aa5fc7ced1bf765b4f025f5a3a138cd87f49e....
Revert changeset 120aa5fc7ced1bf765b4f025f5a3a138cd87f49e. I inadvertantly used "hg import" on a message I saved, expecting it to do the right thing, but instead it made the commit look like I authored it, and filled the description with the email header. Changeset 737f9b90c571b3991f7e35dc846e7ef38a475cfe contains a guard against "hg import" doing this again.
mpm@selenic.com - - Load All Authors

File last commit:

r466:c084cfbb default
r1191:77a0c752 default
Show More
hgmerge.1.txt
35 lines | 826 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).