Mercurial > hg

diff tests/test-merge9.t @ 21940:9209c02f1f25 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: report no argument warning using a hint With this change resolve and revert produce consistent output when run with no arguments: $ hg resolve abort: no files or directories specified (use --all to remerge all files) $ hg revert abort: no files or directories specified (use --all to revert all files)
author Nathan Goldbaum <ngoldbau@ucsc.edu>
date Thu, 24 Jul 2014 14:29:08 -0700
parents f2719b387380
children e635bc9bb7d9
line wrap: on
line diff
--- a/tests/test-merge9.t	Thu Jul 24 12:12:12 2014 -0700
+++ b/tests/test-merge9.t	Thu Jul 24 14:29:08 2014 -0700
@@ -76,7 +76,8 @@
 
 resolve all warning
   $ hg resolve
-  abort: no files or directories specified; use --all to remerge all files
+  abort: no files or directories specified
+  (use --all to remerge all files)
   [255]
 
 resolve all