diff tests/test-amend.t @ 5636:3f9ef377e670 mercurial-5.1

test-compat: merge mercurial-5.2 into mercurial-5.1

# no-check-commit

--- a/tests/test-amend.t	Sat Oct 31 19:05:48 2020 +0800
+++ b/tests/test-amend.t	Sat Oct 31 19:10:55 2020 +0800
@@ -219,12 +219,10 @@
   $ hg ci -m "edited a"
   1 new orphan changesets
   $ hg debugobsolete $(hg id -ir 0 --debug) $(hg id -ir 2 --debug)
-  1 new obsolescence markers
   2 new content-divergent changesets
 
 remove divergence by pruning one side of divergenence
   $ hg debugobsolete $(hg id -ir 2 --debug)
-  1 new obsolescence markers
   obsoleted 1 changesets
 
   $ hg evolve -l