# HG changeset patch
# User Nathan Goldbaum <ngoldbau@ucsc.edu>
# Date 1406237348 25200
# Node ID 9209c02f1f2548045f37f4a0f617723079503028
# Parent  f486001f9d6fc7dd161016eedfa68a42b7a2840a
resolve: report no argument warning using a hint

With this change resolve and revert produce consistent output when run with no
arguments:

$ hg resolve
abort: no files or directories specified
(use --all to remerge all files)

$ hg revert
abort: no files or directories specified
(use --all to revert all files)

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:
diff -r f486001f9d6f -r 9209c02f1f25 tests/test-merge9.t
--- a/tests/test-merge9.t	Thu Jul 24 12:12:12 2014 -0700
+++ b/tests/test-merge9.t	Thu Jul 24 14:29:08 2014 -0700
@@ -76,7 +76,8 @@
 
 resolve all warning
   $ hg resolve
-  abort: no files or directories specified; use --all to remerge all files
+  abort: no files or directories specified
+  (use --all to remerge all files)
   [255]
 
 resolve all