tests/test-resolve.t

--- a/tests/test-resolve.t	Fri Apr 18 18:26:42 2014 -0700
+++ b/tests/test-resolve.t	Fri Apr 18 19:08:32 2014 -0700
@@ -37,9 +37,11 @@
   $ hg resolve -m file
   $ hg commit -m 'resolved'
 
-resolve -l, should be empty
+resolve -l should error since no merge in progress
 
   $ hg resolve -l
+  abort: resolve command not applicable when not merging
+  [255]
 
 test crashed merge with empty mergestate