# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1277678503 18000
# Node ID eac141407b854b90b81eef4e6e6ecc86f7ab06f1
# Parent  51021f4c80b5dcf608626ddc24b21c155df2cae8
merge: document how to 'undo' a merge

diff -r 51021f4c80b5 -r eac141407b85 mercurial/commands.py
--- a/mercurial/commands.py	Sun Jun 27 23:12:05 2010 +0200
+++ b/mercurial/commands.py	Sun Jun 27 17:41:43 2010 -0500
@@ -2570,6 +2570,10 @@
     head, the other head is merged with by default. Otherwise, an
     explicit revision with which to merge with must be provided.
 
+    To undo an uncommitted merge, use :hg:`update --clean .` which
+    will check out a clean copy of the original merge parent, losing
+    all changes.
+
     Returns 0 on success, 1 if there are unresolved files.
     """