Mercurial > hg > mercurial-crew-with-dirclash
view doc/hgmerge.1.txt @ 664:e1fbc1982372
hgeditor: Simplify manifest hash adding
# HG changeset patch
# User Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl>
# Node ID be12687d4bf0ce16c4207bef85c188de66efbf53
# Parent 341d27f865903223f8bf12382e3596167228a1c1
hgeditor: Simplify manifest hash adding
I hope no one will miss the colon.
| author | Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl> |
|---|---|
| date | Sun, 10 Jul 2005 16:00:30 -0800 |
| parents | c084cfbb2389 |
| children | 3ab6e55ee361 |
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).