--- a/tests/test-evolve-public-content-divergent-corner-cases.t	Wed Apr 24 20:32:01 2019 +0200
+++ b/tests/test-evolve-public-content-divergent-corner-cases.t	Wed Apr 17 21:16:17 2019 +0530
@@ -642,6 +642,7 @@
   updating to "local" side of the conflict: c7d2d47c7240
   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
@@ -650,6 +651,7 @@
   updating to "local" side of the conflict: a52ac76b45f5
   merging "other" content-divergent changeset '6a87ed4aa317'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  content divergence resolution between a52ac76b45f5 (public) and 6a87ed4aa317 has same content as a52ac76b45f5, discarding 6a87ed4aa317
   $ hg sum
   parent: 8:a52ac76b45f5 tip
    c_F