--- a/tests/test-stabilize-result.t	Sat Dec 16 23:40:39 2017 +0100
+++ b/tests/test-stabilize-result.t	Tue Jan 16 04:35:34 2018 +0100
@@ -96,13 +96,13 @@
   +a
   +newer a
   $ hg evolve --continue
-  grafting 5:3655f0f50885 "newer a"
+  evolving 5:3655f0f50885 "newer a"
   abort: unresolved merge conflicts (see 'hg help resolve')
   [255]
   $ hg resolve -m a
   (no more unresolved files)
   $ hg evolve --continue
-  grafting 5:3655f0f50885 "newer a"
+  evolving 5:3655f0f50885 "newer a"
 
 Stabilize latecomer with different parent
 =========================================
@@ -162,7 +162,7 @@
   hg rebase --rev (73b15c7566e9|d5c7ef82d003) --dest 66719795a494; (re)
   hg update 1cf0aacfd363;
   hg revert --all --rev (73b15c7566e9|d5c7ef82d003); (re)
-  hg commit --msg "bumped update to %s" (no-eol)
+  hg commit --msg "bumped update to d5c7ef82d003"
   $ hg evolve --any --confirm --phase-divergent
   recreate:[12] newer a
   atop:[8] newer a