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-content-divergent-stack.t
changeset 4607 d314deb12f08
parent 4577 bcd52ce0916d
child 4633 61c2518cd6d2 
--- a/tests/test-evolve-content-divergent-stack.t	Fri Apr 19 10:01:32 2019 -0700
+++ b/tests/test-evolve-content-divergent-stack.t	Fri Apr 19 09:41:39 2019 -0700
@@ -145,7 +145,6 @@
   base: [1] added a
   merging "other" content-divergent changeset '82b74d5dc678'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  6 new orphan changesets
   merge:[6] added b
   with: [10] added b
   base: [2] added b
@@ -322,7 +321,6 @@
   updating to "local" side of the conflict: c04ff147ef79
   merging "other" content-divergent changeset '186bdc2cdfa2'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  6 new orphan changesets
   merge:[11] added b
   with: [6] added b
   base: [2] added b
evolve