Mercurial > public > mercurial-scm > hg

diff tests/test-merge9.t @ 26352:e635bc9bb7d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: consistently describe re-merge + unresolved
author timeless@mozdev.org
date Fri, 25 Sep 2015 03:51:46 -0400
parents 9209c02f1f25
children ef1eb6df7071
line wrap: on
line diff
--- 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