# HG changeset patch
# User timeless@mozdev.org
# Date 1443167506 14400
# Node ID e635bc9bb7d99b1cae54e869e04d6c98bcf89479
# Parent  8c7d8d5e1e0fcb8fc662450409f9667499252307
resolve: consistently describe re-merge + unresolved

diff -r 8c7d8d5e1e0f -r e635bc9bb7d9 mercurial/commands.py
--- a/mercurial/commands.py	Thu Sep 10 16:53:07 2015 +0200
+++ b/mercurial/commands.py	Fri Sep 25 03:51:46 2015 -0400
@@ -5459,7 +5459,7 @@
         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)
diff -r 8c7d8d5e1e0f -r e635bc9bb7d9 tests/test-merge9.t
--- a/tests/test-merge9.t	Thu Sep 10 16:53:07 2015 +0200
+++ b/tests/test-merge9.t	Fri Sep 25 03:51:46 2015 -0400
@@ -77,7 +77,7 @@
 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
diff -r 8c7d8d5e1e0f -r e635bc9bb7d9 tests/test-resolve.t
--- a/tests/test-resolve.t	Thu Sep 10 16:53:07 2015 +0200
+++ b/tests/test-resolve.t	Fri Sep 25 03:51:46 2015 -0400
@@ -129,7 +129,7 @@
 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