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)