tests/test-resolve.t

--- a/tests/test-resolve.t	Sun May 25 13:47:42 2014 +0200
+++ b/tests/test-resolve.t	Fri May 23 13:10:31 2014 -0700
@@ -42,9 +42,12 @@
   no more unresolved files
   $ hg commit -m 'resolved'
 
-resolve -l should error since no merge in progress
+resolve -l should be empty
 
   $ hg resolve -l
+
+resolve -m should abort since no merge in progress
+  $ hg resolve -m
   abort: resolve command not applicable when not merging
   [255]