diff -r 5c964ebe4d4b -r f9dad99a90d5 tests/test-evolve-abort-contentdiv.t
--- a/tests/test-evolve-abort-contentdiv.t	Tue Jun 12 23:20:54 2018 +0530
+++ b/tests/test-evolve-abort-contentdiv.t	Wed Jun 13 17:15:10 2018 +0530
@@ -169,7 +169,6 @@
   updating to "local" side of the conflict: 2ba73e31f264
   merging "other" content-divergent changeset '491e10505bae'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  nothing changed
   merge:[5] added d
   with: [7] added d
   base: [4] added d
@@ -182,6 +181,7 @@
   [255]
 
   $ hg evolve --abort
+  2 new content-divergent changesets
   evolve aborted
   working directory is now at 491e10505bae