diff -r 2b06f144b6e0 -r 823031b51d81 tests/test-stabilize-conflict.t
--- a/tests/test-stabilize-conflict.t	Tue Jan 09 23:42:57 2018 +0530
+++ b/tests/test-stabilize-conflict.t	Sat Jan 06 18:48:15 2018 +0530
@@ -168,7 +168,7 @@
   $ hg resolve --all -m
   (no more unresolved files)
   $ hg evolve --continue
-  grafting 4:71c18f70c34f "babar count up to fifteen"
+  evolving 4:71c18f70c34f "babar count up to fifteen"
   $ hg resolve -l
   $ hg log -G
   @  changeset:   6:1836b91c6c1d