--- a/tests/test-uncommit.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-uncommit.t	Fri Oct 20 20:04:13 2017 +0200
@@ -244,7 +244,7 @@
   (use 'hg evolve' to update to its successor: e8db4aa611f6)
   $ hg --config extensions.purge= purge
   $ hg uncommit -I 'set:added() and e'
-  2 new content-divergent changesets
+  2 new divergent changesets
   $ hg st --copies
   A e
   $ hg st --copies --change .
@@ -290,7 +290,7 @@
   (5eb72dbe0cb4 has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue)
   $ hg --config extensions.purge= purge
   $ hg uncommit --all -X e
-  1 new content-divergent changesets
+  1 new divergent changesets
   $ hg st --copies
   M b
   M d
@@ -337,7 +337,7 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   [8] touncommit
   $ hg uncommit aa
-  1 new orphan changesets
+  1 new unstable changesets
 
 Test uncommiting agains a different base