diff -r cb0d62ed5e2a -r abe6dfbdc744 tests/test-evolve-obshistory.t --- a/tests/test-evolve-obshistory.t Thu Jun 01 16:26:00 2017 +0200 +++ b/tests/test-evolve-obshistory.t Tue Jun 06 15:10:13 2017 -0700 @@ -1035,7 +1035,7 @@ $ hg update --hidden 'desc(A0)' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (471f378eab4c) - (471f378eab4c has diverged, use 'hg evolve -list --divergent' to resolve the issue) + (471f378eab4c has diverged, use 'hg evolve --list --divergent' to resolve the issue) Test output with amended + folded commit ========================================