--- a/tests/test-stabilize-result.t	Wed Jan 07 15:24:47 2015 -0800
+++ b/tests/test-stabilize-result.t	Fri Jan 30 19:01:23 2015 +0000
@@ -93,7 +93,7 @@
   +newer a
   $ hg evolve --continue
   grafting 5:3655f0f50885 "newer a"
-  abort: unresolved merge conflicts (see hg help resolve)
+  abort: unresolved merge conflicts (see "hg help resolve")
   [255]
   $ hg resolve -m a
   (no more unresolved files)
@@ -256,9 +256,15 @@
   merging a
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   amending changeset eacc9c8240fe
+  committing files:
   a
+  committing manifest
+  committing changelog
   copying changeset 283ccd10e2b8 to 7bc2f5967f5e
+  committing files:
   a
+  committing manifest
+  committing changelog
   committed changeset 21:f344982e63c4
   working directory is now at f344982e63c4
   $ hg st