--- a/tests/test-stabilize-result.t	Thu Dec 28 04:09:02 2017 +0530
+++ b/tests/test-stabilize-result.t	Sat Dec 09 08:19:07 2017 +0530
@@ -159,7 +159,7 @@
   hg rebase --rev d5c7ef82d003 --dest 66719795a494;
   hg update 1cf0aacfd363;
   hg revert --all --rev d5c7ef82d003;
-  hg commit --msg "bumped update to %s" (no-eol)
+  hg commit --msg "phase-divergent update to d5c7ef82d003"
   $ hg evolve --any --confirm --phase-divergent
   recreate:[9] newer a
   atop:[6] newer a
@@ -267,7 +267,7 @@
   merge:[14] More addition
   with: [13] More addition
   base: [12] More addition
-  merging divergent changeset
+  merging content-divergent changeset
   resolving manifests
   merging a
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved