diff -r 4582a4dd1817 -r 610873cf064a mercurial/merge.py
--- a/mercurial/merge.py	Tue May 31 15:55:23 2011 -0500
+++ b/mercurial/merge.py	Tue May 31 11:52:22 2011 -0700
@@ -529,7 +529,7 @@
                 raise util.Abort(_("crosses branches (merge branches or use"
                                    " --clean to discard changes)"))
             elif onode is None:
-                raise util.Abort(_("crosses branches (merge branches or use"
+                raise util.Abort(_("crosses branches (merge branches or update"
                                    " --check to force update)"))
             else:
                 # Allow jumping branches if clean and specific rev given