Mercurial > hg > evolve

diff tests/test-evolve-obshistory.t @ 3259:406992d0d611

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: rename --contentdivergent flag to --content-divergent This makes the whole things easier to read.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 26 Oct 2017 09:02:25 +0200
parents 663dbef40f97
children e1a230cc4527 13cb0810ce22
line wrap: on
line diff
--- a/tests/test-evolve-obshistory.t
+++ b/tests/test-evolve-obshistory.t
@@ -1287,7 +1287,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
 ========================================