Mercurial > hg > mercurial-crew-with-dirclash

annotate doc/hgmerge.1.txt @ 537:411e05b04ffa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Propagate file list through dodiff -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Propagate file list through dodiff This speeds up operations like 'hg diff Makefile'. Previously it would walk the entire directory tree looking for changes. Now it will only stat Makefile. Further, if Makefile appears untouched, it will skip reading the manifest. manifest hash: ab22a70a5511ed2d7a647f2cd15d129a88dccabf -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxNRyywK+sNU5EO8RAgb6AKC2TzWmRjNsWq0Q9Pa+ppCZ6Y+pdwCfdHUA UHu024/2Wt6C6WZ5vcWfPbo= =E35L -----END PGP SIGNATURE-----
author mpm@selenic.com
date Thu, 30 Jun 2005 21:28:18 -0800
parents c084cfbb2389
children 3ab6e55ee361
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 -------
c084cfbb2389 Add hgmerge manpage
mpm@selenic.com
parents:
diff changeset
33 Copyright (C) 2005 Matt Mackall.
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).