resolve: consistently describe re-merge + unresolved

mercurial/commands.py

@@ -5459,7 +5459,7 b' def resolve(ui, repo, *pats, **opts):'
         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'),
-                         hint=('use --all to remerge all files'))
+                         hint=('use --all to re-merge all unresolved files'))
 
     if show:
         fm = ui.formatter('resolve', opts)

tests/test-merge9.t

@@ -77,7 +77,7 b' after resolve'
 resolve all warning
   $ hg resolve
   abort: no files or directories specified
-  (use --all to remerge all files)
+  (use --all to re-merge all unresolved files)
   [255]
 
 resolve all

tests/test-resolve.t

@@ -129,7 +129,7 b' get back to conflicting state'
 resolve without arguments should suggest --all
   $ hg resolve
   abort: no files or directories specified
-  (use --all to remerge all files)
+  (use --all to re-merge all unresolved files)
   [255]
 
 resolve --all should re-merge all unresolved files