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
branchmercurial-4.3
changeset 3166 e1a230cc4527
parent 3116 9f900937c198
parent 3154 406992d0d611
child 3167 f089741039e5
child 3287 4303a46b4167 
--- 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
 ========================================
evolve