Mercurial > hg > mercurial-crew-with-dirclash
view doc/hgmerge.1.txt @ 2755:6c2c10cedf7a
Check for parent/mod as well as parent.mod in findext.
Debian/Ubuntu ship a system-wide hgrc that loads extensions using
the syntax hgext/extension=, rather than hgext.extension=. Although
the extensions work correctly, hg help <extension> doesn't
understand this form without this patch.
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Tue, 01 Aug 2006 14:56:54 -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).