merge: document how to 'undo' a merge stable
authorMatt Mackall <mpm@selenic.com>
Sun, 27 Jun 2010 17:41:43 -0500
branchstable
changeset 11452 eac141407b85
parent 11451 51021f4c80b5
child 11453 2ee26044d846
merge: document how to 'undo' a merge
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.
     """