Mercurial > hg

annotate doc/hgmerge.1.txt @ 3339:0e3c45a74683

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ui.py: don't let parent and child ui objects share header and prev_header
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Tue, 10 Oct 2006 18:43:20 -0300
parents 345bac2bc4ec
children 63b9d2deed48
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
466
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
1 HGMERGE(1)
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
2 ==========
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
3 Matt Mackall <mpm@selenic.com>
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
4 v0.1, 27 May 2005
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
5
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
6 NAME
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
7 ----
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
8 hgmerge - default wrapper to merge files in Mercurial SCM system
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
9
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
10 SYNOPSIS
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
11 --------
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
12 'hgmerge' local ancestor remote
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
13
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
14 DESCRIPTION
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
15 -----------
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
16 The hgmerge(1) command provides a graphical interface to merge files in the
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
17 Mercurial system. It is a simple wrapper around kdiff3, merge(1) and tkdiff(1),
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
18 or simply diff(1) and patch(1) depending on what is present on the system.
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
19
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
20 hgmerge(1) is used by the Mercurial SCM if the environment variable HGMERGE is
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
21 not set.
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
22
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
23 AUTHOR
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
24 ------
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
25 Written by Vincent Danjean <Vincent.Danjean@free.fr>
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
26
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
27 SEE ALSO
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
28 --------
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
29 hg(1) - the command line interface to Mercurial SCM
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
30
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
31 COPYING
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
32 -------
2859
345bac2bc4ec update copyrights.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1341
diff changeset
33 Copyright \(C) 2005, 2006 Matt Mackall.
466
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
34 Free use of this software is granted under the terms of the GNU General
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
35 Public License (GPL).