diff -r 6c3f4cfa582e -r d314deb12f08 tests/test-evolve-public-content-divergent-corner-cases.t --- a/tests/test-evolve-public-content-divergent-corner-cases.t Fri Apr 19 10:01:32 2019 -0700 +++ b/tests/test-evolve-public-content-divergent-corner-cases.t Fri Apr 19 09:41:39 2019 -0700 @@ -643,7 +643,6 @@ merging "other" content-divergent changeset '0773642cfa95' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved content divergence resolution between c7d2d47c7240 (public) and 0773642cfa95 has same content as c7d2d47c7240, discarding 0773642cfa95 - 1 new orphan changesets merge:[8] c_F with: [10] c_F base: [6] c_F