# HG changeset patch
# User Adrian Buehlmann <adrian@cadifra.com>
# Date 1341948378 -7200
# Node ID 71e36b3d2cc46e4fc08e568b1ec5fef3ecef671c
# Parent  c9e6c6ae4ea115faba70064490ef18564ade8a2f
update: mention how update can be used to cancel an uncommitted merge

diff -r c9e6c6ae4ea1 -r 71e36b3d2cc4 mercurial/commands.py
--- 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`).