--- a/tests/test-obsolete.t Tue Jul 25 15:18:09 2017 +0200
+++ b/tests/test-obsolete.t Wed Sep 27 01:22:58 2017 +0200
@@ -694,7 +694,7 @@
$ hg up --hidden 2
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory parent is obsolete! (4538525df7e2)
- (4538525df7e2 has diverged, use 'hg evolve --list --divergent' to resolve the issue)
+ (4538525df7e2 has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue)
$ hg export 9468a5f5d8b2 | hg import -
applying patch from stdin
1 new unstable changesets