Mercurial > evolve

diff tests/test-evolve-obshistory.t @ 3166:e1a230cc4527 mercurial-4.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge stable into mercurial-4.3
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 01 Nov 2017 23:57:56 +0100
parents 9f900937c198 406992d0d611
children f089741039e5 4303a46b4167
line wrap: on
line diff
--- a/tests/test-evolve-obshistory.t	Mon Oct 23 15:50:18 2017 +0200
+++ b/tests/test-evolve-obshistory.t	Wed Nov 01 23:57:56 2017 +0100
@@ -1293,7 +1293,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 --contentdivergent' to resolve the issue)
+  (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
 
 Test output with amended + folded commit
 ========================================