--- a/tests/test-shelve.t Fri Apr 18 18:26:42 2014 -0700
+++ b/tests/test-shelve.t Fri Apr 18 19:08:32 2014 -0700
@@ -262,6 +262,8 @@
summary: second
$ hg resolve -l
+ abort: resolve command not applicable when not merging
+ [255]
$ hg status
A foo/foo
? a/a.orig