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-divergent.t
changeset 2856 f6517779a7c4
parent 2835 20c2499ce8bc
child 2858 4b934144ed11 
--- a/tests/test-divergent.t	Thu Aug 24 09:11:54 2017 +0200
+++ b/tests/test-divergent.t	Thu Aug 24 09:12:09 2017 +0200
@@ -45,7 +45,7 @@
   1 changesets pruned
   $ hg prune -s "desc(bdivergent2)" "desc(_b)" --hidden
   1 changesets pruned
-  2 new divergent changesets
+  2 new contentdivergent changesets
   $ hg log -G
   @  3:e708fd28d5cf@default(draft) add bdivergent2 [content-divergent]
   |
@@ -88,7 +88,7 @@
   1 changesets pruned
   $ hg prune -s "desc(cdivergent2)" "desc(_c)" --hidden
   1 changesets pruned
-  2 new divergent changesets
+  2 new contentdivergent changesets
   $ hg log -G
   @  8:0a768ef678d9@default(draft) cdivergent2 [content-divergent]
   |
@@ -124,7 +124,7 @@
   1 changesets pruned
   $ hg prune -s "desc(bdivergent2)" "desc(_b)" --hidden
   1 changesets pruned
-  2 new divergent changesets
+  2 new contentdivergent changesets
   $ hg log -G
   @  3:e708fd28d5cf@default(draft) add bdivergent2 [content-divergent]
   |
evolve