Mercurial > hg > mercurial-crew-with-dirclash
view doc/hgmerge.1.txt @ 1410:17703aa4491e
hgweb: shorten all the URLs in the standard templates
A URL like this:
http://www.selenic.com/hg/?cmd=changeset;node=5010207c35273ac1331cae44c253dd41fa07cb7f
is now presented as:
http://www.selenic.com/hg/?cs=5010207c352
(though the old style still works, of course)
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 18 Oct 2005 23:08:35 -0700 |
| parents | 3ab6e55ee361 |
| children | 345bac2bc4ec |
line wrap: on
line source
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).