--- a/tests/test-histedit-non-commute-abort.t	Sun May 25 13:47:42 2014 +0200
+++ b/tests/test-histedit-non-commute-abort.t	Fri May 23 13:10:31 2014 -0700
@@ -85,8 +85,6 @@
 
 log after abort
   $ hg resolve -l
-  abort: resolve command not applicable when not merging
-  [255]
   $ hg log --graph
   @  changeset:   6:bfa474341cc9
   |  tag:         tip