# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1412283234 18000
# Node ID 7068ccfed963f65680583660c4b54d5d425dae6c
# Parent  fbc400c1b0221706064bf53cee1a03421139a4ef
test: adapt to core mercurial 9ab18a912c44

This changesets improved the output of prompt during test.

diff -r fbc400c1b022 -r 7068ccfed963 tests/test-stabilize-conflict.t
--- 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)