1HGMERGE(1)                                                          HGMERGE(1)
2
3
4

NAME

6       hgmerge - default wrapper to merge files in Mercurial SCM system
7

SYNOPSIS

9       hgmerge local ancestor remote
10
11

DESCRIPTION

13       The hgmerge(1) command provides a graphical interface to merge files in
14       the Mercurial system. It is a simple wrapper around kdiff3, merge(1)
15       and tkdiff(1), or simply diff(1) and patch(1) depending on what is
16       present on the system.
17
18       hgmerge(1) is used by the Mercurial SCM if the environment variable
19       HGMERGE is not set.
20
21

AUTHOR

23       Written by Vincent Danjean <Vincent.Danjean@free.fr>
24
25

SEE ALSO

27       hg(1) - the command line interface to Mercurial SCM
28
29

COPYING

31       Copyright (C) 2005-2007 Matt Mackall. Free use of this software is
32       granted under the terms of the GNU General Public License (GPL).
33
34
35
36
37                                  06/25/2007                        HGMERGE(1)