Mercurial > hg > mercurial-crew-with-dirclash

comparison doc/hgmerge.1.txt @ 466:c084cfbb2389

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add hgmerge manpage -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add hgmerge manpage - From Vincent Danjean manifest hash: db96fb3109a588052b21e49df81cfe65c98e72d7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvQT2ywK+sNU5EO8RAmuFAJ0TFJ7K88OP/dMJVcFtD6Tiuon8SwCgl+W+ 4NgyQCJKwgfGF6nEhqJkgck= =Ymjz -----END PGP SIGNATURE-----
author mpm@selenic.com
date Fri, 24 Jun 2005 23:17:10 -0800
parents
children 3ab6e55ee361
comparison
equal deleted inserted replaced
465:f8cb8d082d40 466:c084cfbb2389
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 -------
33 Copyright (C) 2005 Matt Mackall.
34 Free use of this software is granted under the terms of the GNU General
35 Public License (GPL).