Mercurial > hg
view doc/hgmerge.1.txt @ 5637:bdb81d46b2fb
commit: avoid losing edits during commit
If a file is edited between the time we record file states in the repo
and update the dirstate, that change can be lost to hg status. Because
we invoke the editor between these two points, that window can be
arbitrarily large.
This greatly shrinks the window by recording the commit change
immediately. If our checkin fails, we simply invalidate the dirstate.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 10 Dec 2007 10:24:29 -0600 |
| parents | 63b9d2deed48 |
| children |
line wrap: on
line source
HGMERGE(1) ========== Matt Mackall <mpm@selenic.com> v0.1, 27 May 2005 NAME ---- hgmerge - default wrapper to merge files in Mercurial SCM system SYNOPSIS -------- 'hgmerge' local ancestor remote DESCRIPTION ----------- 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. hgmerge(1) is used by the Mercurial SCM if the environment variable HGMERGE is not set. AUTHOR ------ Written by Vincent Danjean <Vincent.Danjean@free.fr> SEE ALSO -------- hg(1) - the command line interface to Mercurial SCM COPYING ------- Copyright \(C) 2005-2007 Matt Mackall. Free use of this software is granted under the terms of the GNU General Public License (GPL).