Mercurial > hg > mercurial-crew-with-dirclash
view doc/hgmerge.1.txt @ 2576:6a961a54f953
Changed default timeout for run-tests.py from 30 to 180 seconds.
As e.g. test-http-proxy already takes quite some time (about a minute here)
and tests usually should clean up after themselves, the timeout should only be
hit in case of other problems.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 07 Jul 2006 11:23:53 +0200 |
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).