diff tests/test-stabilize-result.t @ 964:c768f7666106

test: update to output change introduced by future 3.1

--- a/tests/test-stabilize-result.t	Wed May 21 12:01:28 2014 -0700
+++ b/tests/test-stabilize-result.t	Mon Jun 02 15:22:23 2014 -0700
@@ -25,6 +25,7 @@
   $ hg bookmark changea
   $ hg up 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  (leaving bookmark changea)
   $ echo a >> a
   $ hg amend -m changea
   1 new unstable changesets
@@ -94,6 +95,7 @@
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
   $ hg resolve -m a
+  no more unresolved files
   $ hg evolve --continue
   grafting revision 5