--- a/mercurial/hg.py	Sat Sep 19 01:15:38 2009 +0200
+++ b/mercurial/hg.py	Thu Sep 17 22:39:38 2009 -0700
@@ -353,7 +353,7 @@
     _showstats(repo, stats)
     if stats[3]:
         repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
-                         "or 'hg up --clean' to abandon\n"))
+                         "or 'hg update -C' to abandon\n"))
     elif remind:
         repo.ui.status(_("(branch merge, don't forget to commit)\n"))
     return stats[3] > 0