[PATCH] revert: use term "uncommitted merge" in help text

[Adrian Buehlmann]

# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1341849106 -7200
# Node ID d6e4ec20df0ed84f27cdea62953b949848edf392
# Parent  ef60c4a759cef965e56faf2685ecb22aafe9c0db
revert: use term "uncommitted merge" in help text

to make sure users can't possibly be mislead to try this for canceling a
*merge changeset*.

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4904,7 +4904,8 @@
 
     .. note::
        To check out earlier revisions, you should use :hg:`update REV`.
-       To cancel a merge (and lose your changes), use :hg:`update --clean .`.
+       To cancel an uncommitted merge (and lose your changes), use
+       :hg:`update --clean .`.
 
     With no revision specified, revert the specified files or directories
     to the contents they had in the parent of the working directory.