# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1571785873 -7200
# Node ID f3e39a35437852b1cec8898d6bfb6acba315012e
# Parent  86dffe3cec6a063c77fe896a10c467fadb152837# Parent  f26ad80df723fb19b9c74b36f154cf504e7b8503
branching: merge the stable branch with the mercurial-5.1 branch

This revert all the test changes to match the expected output for mercurial 5.1.

diff -r 86dffe3cec6a -r f3e39a354378 tests/test-discovery-obshashrange-cache.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-discovery-obshashrange.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-evolve-templates.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-exchange-obsmarkers-case-A1.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-exchange-obsmarkers-case-A2.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-exchange-obsmarkers-case-A3.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-exchange-obsmarkers-case-A4.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-exchange-obsmarkers-case-A5.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-exchange-obsmarkers-case-A6.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-exchange-obsmarkers-case-A7.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-exchange-obsmarkers-case-B5.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-exchange-obsmarkers-case-B6.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-exchange-obsmarkers-case-C2.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-exchange-obsmarkers-case-C3.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-exchange-obsmarkers-case-C4.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-exchange-obsmarkers-case-D1.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-exchange-obsmarkers-case-D2.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-exchange-obsmarkers-case-D3.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-exchange-obsmarkers-case-D4.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-obsolete.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-pullbundle.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-push-checkheads-partial-C1.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-push-checkheads-partial-C2.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-push-checkheads-partial-C3.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-push-checkheads-partial-C4.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-push-checkheads-pruned-B1.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-push-checkheads-pruned-B2.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-push-checkheads-pruned-B3.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-push-checkheads-pruned-B4.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-push-checkheads-pruned-B5.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-push-checkheads-pruned-B6.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-push-checkheads-pruned-B7.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-push-checkheads-pruned-B8.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-push-checkheads-superceed-A1.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-push-checkheads-superceed-A2.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-push-checkheads-superceed-A3.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-push-checkheads-superceed-A4.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-push-checkheads-superceed-A5.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-push-checkheads-superceed-A6.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-push-checkheads-superceed-A7.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-push-checkheads-superceed-A8.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-push-checkheads-unpushed-D1.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-push-checkheads-unpushed-D2.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-push-checkheads-unpushed-D3.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-push-checkheads-unpushed-D4.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-push-checkheads-unpushed-D5.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-push-checkheads-unpushed-D6.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-push-checkheads-unpushed-D7.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-topic-flow-reject-untopiced.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-topic-flow-single-head.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-topic-tutorial.t
diff -r 86dffe3cec6a -r f3e39a354378 tests/test-wireproto.t