diff -r f486001f9d6f -r 9209c02f1f25 mercurial/commands.py
--- a/mercurial/commands.py	Thu Jul 24 12:12:12 2014 -0700
+++ b/mercurial/commands.py	Thu Jul 24 14:29:08 2014 -0700
@@ -4994,8 +4994,8 @@
     if pats and all:
         raise util.Abort(_("can't specify --all and patterns"))
     if not (all or pats or show or mark or unmark):
-        raise util.Abort(_('no files or directories specified; '
-                           'use --all to remerge all files'))
+        raise util.Abort(_('no files or directories specified'),
+                         hint=('use --all to remerge all files'))
 
     wlock = repo.wlock()
     try: