tests/test-histedit-non-commute-abort.t

--- a/tests/test-histedit-non-commute-abort.t	Fri Apr 18 18:26:42 2014 -0700
+++ b/tests/test-histedit-non-commute-abort.t	Fri Apr 18 19:08:32 2014 -0700
@@ -85,6 +85,8 @@
 
 log after abort
   $ hg resolve -l
+  abort: resolve command not applicable when not merging
+  [255]
   $ hg log --graph
   @  changeset:   6:bfa474341cc9
   |  tag:         tip