--- a/tests/test-stabilize-result.t Fri Jul 25 14:27:16 2014 +0200
+++ b/tests/test-stabilize-result.t Fri Aug 08 10:40:47 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