diff -r 544354cfc626 -r 406992d0d611 tests/test-obsolete.t --- a/tests/test-obsolete.t Thu Oct 26 08:44:50 2017 +0200 +++ b/tests/test-obsolete.t Thu Oct 26 09:02:25 2017 +0200 @@ -721,7 +721,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 --contentdivergent' to resolve the issue) + (4538525df7e2 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) $ hg export 9468a5f5d8b2 | hg import - applying patch from stdin 1 new orphan changesets