--- a/tests/test-unstable.t	Wed Apr 13 23:36:44 2016 +0000
+++ b/tests/test-unstable.t	Thu Apr 14 15:02:10 2016 +0000
@@ -154,9 +154,8 @@
   
 
   $ hg evo --all --any --unstable
-  abort: no support for evolving merge changesets with two obsolete parents yet
+  warning: no support for evolving merge changesets with two obsolete parents yet
   (Redo the merge and use `hg prune <old> --succ <new>` to obsolete the old one)
-  [255]
   $ hg log -G
   @  5:2db39fda7e2f@default(draft) cprime
   |