Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: adapt to core mercurial 9ab18a912c44
authorPierre-Yves David <pierre-yves.david@fb.com>
Thu, 02 Oct 2014 15:53:54 -0500
changeset 1119 7068ccfed963
parent 1118 fbc400c1b022
child 1120 9bc4857f573b
test: adapt to core mercurial 9ab18a912c44 This changesets improved the output of prompt during test.
tests/test-stabilize-conflict.t file | annotate | diff | comparison | revisions 
--- 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)
evolve