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