diff -r 6c4a05dc5b5c -r f66227d76402 tests/test-uncommit.t
--- a/tests/test-uncommit.t	Tue Jul 25 15:18:24 2017 +0200
+++ b/tests/test-uncommit.t	Wed Sep 27 01:27:40 2017 +0200
@@ -287,7 +287,7 @@
   $ hg up -C 3 --hidden
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (5eb72dbe0cb4)
-  (5eb72dbe0cb4 has diverged, use 'hg evolve --list --divergent' to resolve the issue)
+  (5eb72dbe0cb4 has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue)
   $ hg --config extensions.purge= purge
   $ hg uncommit --all -X e
   1 new divergent changesets