hgmerge1
Default wrapper to merge files in mercurial scm system
Usage
hgmerge local
ancestor
remote.sp
Overview
The hgmerge(1) command provides a graphical interface to merge files in the Mercurial system. It is a simple wrapper around kdiff3, merge(1) and tkdiff(1), or simply diff(1) and patch(1) depending on what is present on the system..sp hgmerge(1) is used by the Mercurial SCM if the environment variable HGMERGE is not set..sp
Copying
Copyright (C) 2005 Matt Mackall. Free use of this software is granted under the terms of the GNU General Public License (GPL)..sp