Mercurial > hg > mercurial-crew-with-dirclash
annotate doc/hgmerge.1.txt @ 5095:d27ed83289ee
Add message to test output if a test is aborted due to a timeout.
Without this an aborted test could produce an empty .err file so the diff
looks like as if all lines of the .out files are just missing for some unknown
reason.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 06 Aug 2007 14:45:43 +0200 |
parents | 63b9d2deed48 |
children |
rev | line source |
---|---|
466 | 1 HGMERGE(1) |
2 ========== | |
3 Matt Mackall <mpm@selenic.com> | |
4 v0.1, 27 May 2005 | |
5 | |
6 NAME | |
7 ---- | |
8 hgmerge - default wrapper to merge files in Mercurial SCM system | |
9 | |
10 SYNOPSIS | |
11 -------- | |
12 'hgmerge' local ancestor remote | |
13 | |
14 DESCRIPTION | |
15 ----------- | |
16 The hgmerge(1) command provides a graphical interface to merge files in the | |
17 Mercurial system. It is a simple wrapper around kdiff3, merge(1) and tkdiff(1), | |
18 or simply diff(1) and patch(1) depending on what is present on the system. | |
19 | |
20 hgmerge(1) is used by the Mercurial SCM if the environment variable HGMERGE is | |
21 not set. | |
22 | |
23 AUTHOR | |
24 ------ | |
25 Written by Vincent Danjean <Vincent.Danjean@free.fr> | |
26 | |
27 SEE ALSO | |
28 -------- | |
29 hg(1) - the command line interface to Mercurial SCM | |
30 | |
31 COPYING | |
32 ------- | |
4635
63b9d2deed48
Updated copyright notices and add "and others" to "hg version"
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2858
diff
changeset
|
33 Copyright \(C) 2005-2007 Matt Mackall. |
466 | 34 Free use of this software is granted under the terms of the GNU General |
35 Public License (GPL). |