diff tests/test-evolve-content-divergent-relocation.t @ 5766:82da27321e91 mercurial-4.7

test-compat: merge mercurial-4.8 into mercurial-4.7

# no-check-commit

--- a/tests/test-evolve-content-divergent-relocation.t	Sun Jan 31 16:06:16 2021 +0800
+++ b/tests/test-evolve-content-divergent-relocation.t	Sun Jan 31 16:15:26 2021 +0800
@@ -663,8 +663,8 @@
 The other side of the divergence gets amended so it matches upstream.
 Relocation (onto upstream) will therefore result in no changes to commit.
   $ hg revert -r 'desc("upstream")' --all
+  reverting a
   removing b
-  reverting a
   $ hg amend --config experimental.evolution.allowdivergence=True
   2 new content-divergent changesets