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-obsolete.t
branchmercurial-4.3
changeset 3166 e1a230cc4527
parent 3116 9f900937c198
parent 3154 406992d0d611
child 3167 f089741039e5
child 3418 85cdce113c2c 
--- a/tests/test-obsolete.t	Mon Oct 23 15:50:18 2017 +0200
+++ b/tests/test-obsolete.t	Wed Nov 01 23:57:56 2017 +0100
@@ -719,7 +719,7 @@
   $ hg up --hidden 2
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory parent is obsolete! (4538525df7e2)
-  (4538525df7e2 has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue)
+  (4538525df7e2 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
   $ hg export 9468a5f5d8b2 | hg import -
   applying patch from stdin
   1 new unstable changesets
evolve