Mercurial > hg

changeset 17144:71e36b3d2cc4 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: mention how update can be used to cancel an uncommitted merge
author Adrian Buehlmann <adrian@cadifra.com>
date Tue, 10 Jul 2012 21:26:18 +0200
parents c9e6c6ae4ea1
children f7152a0d90df dd09bbd48646
files mercurial/commands.py
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Tue Jul 10 11:15:22 2012 +0200
+++ b/mercurial/commands.py	Tue Jul 10 21:26:18 2012 +0200
@@ -5639,6 +5639,9 @@
     3. With the -C/--clean option, uncommitted changes are discarded and
        the working directory is updated to the requested changeset.
 
+    To cancel an uncommitted merge (and lose your changes), use
+    :hg:`update --clean .`.
+
     Use null as the changeset to remove the working directory (like
     :hg:`clone -U`).