mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
041288b787
--- hg.orig/doc/hg.1.txt 2005-09-22 09:40:47.000000000 -0700 +++ hg/doc/hg.1.txt 2005-09-23 18:31:58.000000000 -0700 @@ -802,6 +802,6 @@ http://selenic.com/mailman/listinfo/merc COPYING ------- -Copyright (C) 2005 Matt Mackall. +Copyright \(C) 2005 Matt Mackall. Free use of this software is granted under the terms of the GNU General Public License (GPL). Index: hg/doc/hgmerge.1.txt =================================================================== --- hg.orig/doc/hgmerge.1.txt 2005-06-30 10:19:51.000000000 -0700 +++ hg/doc/hgmerge.1.txt 2005-09-23 18:31:59.000000000 -0700 @@ -30,6 +30,6 @@ hg(1) - the command line interface to Me COPYING ------- -Copyright (C) 2005 Matt Mackall. +Copyright \(C) 2005 Matt Mackall. Free use of this software is granted under the terms of the GNU General Public License (GPL).
36 lines
827 B
Plaintext
36 lines
827 B
Plaintext
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).
|