diff -r 16b4f0e32d9d -r 1e2f683e11e7 tests/test-stabilize-conflict.t
--- a/tests/test-stabilize-conflict.t	Sat Dec 16 23:40:40 2017 +0100
+++ b/tests/test-stabilize-conflict.t	Tue Jan 16 04:38:04 2018 +0100
@@ -167,7 +167,7 @@
   $ hg resolve --all -m
   (no more unresolved files)
   $ hg evolve --continue
-  grafting 5:71c18f70c34f "babar count up to fifteen"
+  evolving 5:71c18f70c34f "babar count up to fifteen"
   $ hg resolve -l
   $ hg log -G
   @  changeset:   8:1836b91c6c1d