Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-evolve-obshistory.t
changeset 3154 406992d0d611
parent 3115 663dbef40f97
child 3166 e1a230cc4527
child 3216 13cb0810ce22 
--- a/tests/test-evolve-obshistory.t	Thu Oct 26 08:44:50 2017 +0200
+++ b/tests/test-evolve-obshistory.t	Thu Oct 26 09:02:25 2017 +0200
@@ -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
 ========================================
evolve