Mercurial > hg

diff mercurial/commands.py @ 11452:eac141407b85 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: document how to 'undo' a merge
author Matt Mackall <mpm@selenic.com>
date Sun, 27 Jun 2010 17:41:43 -0500
parents ee1ed6afac21
children 59af1d65029c
line wrap: on
line diff
--- 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.
     """