--- a/tests/test-stabilize-conflict.t	Thu Oct 02 15:50:07 2014 -0500
+++ b/tests/test-stabilize-conflict.t	Thu Oct 02 15:53:54 2014 -0500
@@ -217,7 +217,8 @@
   atop:[10] babar count up to ten
   merging babar
    output file babar appears unchanged
-  was merge successful (yn)? merging babar failed!
+  was merge successful (yn)? n
+  merging babar failed!
   evolve failed!
   fix conflict and run "hg evolve --continue"
   abort: unresolved merge conflicts (see hg help resolve)