# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1516073563 -3600
# Node ID d3a17c67f85c0dcc2cefd8fd264694368ce09e4e
# Parent  740e1267be6f475352a6d364b23b4ec35266dab6# Parent  bf6b859807bac23752a26e58876fe3a4a9a2fef8
branching: merge stable back into default

The test change has to be reverted.

diff -r 740e1267be6f -r d3a17c67f85c tests/test-discovery-obshashrange.t
diff -r 740e1267be6f -r d3a17c67f85c tests/test-divergent.t
diff -r 740e1267be6f -r d3a17c67f85c tests/test-evolve-obshistory-complex.t
diff -r 740e1267be6f -r d3a17c67f85c tests/test-evolve-obshistory.t
diff -r 740e1267be6f -r d3a17c67f85c tests/test-evolve-order.t
diff -r 740e1267be6f -r d3a17c67f85c tests/test-evolve-phase.t
diff -r 740e1267be6f -r d3a17c67f85c tests/test-evolve-split.t
diff -r 740e1267be6f -r d3a17c67f85c tests/test-evolve-templates.t
diff -r 740e1267be6f -r d3a17c67f85c tests/test-evolve-topic.t
diff -r 740e1267be6f -r d3a17c67f85c tests/test-evolve.t
diff -r 740e1267be6f -r d3a17c67f85c tests/test-exchange-obsmarkers-case-A4.t
diff -r 740e1267be6f -r d3a17c67f85c tests/test-exchange-obsmarkers-case-B5.t
diff -r 740e1267be6f -r d3a17c67f85c tests/test-issue-5720.t
diff -r 740e1267be6f -r d3a17c67f85c tests/test-obsolete.t
diff -r 740e1267be6f -r d3a17c67f85c tests/test-push-checkheads-partial-C2.t
diff -r 740e1267be6f -r d3a17c67f85c tests/test-push-checkheads-partial-C4.t
diff -r 740e1267be6f -r d3a17c67f85c tests/test-sharing.t
diff -r 740e1267be6f -r d3a17c67f85c tests/test-stabilize-conflict.t
diff -r 740e1267be6f -r d3a17c67f85c tests/test-stabilize-order.t
diff -r 740e1267be6f -r d3a17c67f85c tests/test-stabilize-result.t
diff -r 740e1267be6f -r d3a17c67f85c tests/test-stack-branch.t
diff -r 740e1267be6f -r d3a17c67f85c tests/test-topic-change.t
diff -r 740e1267be6f -r d3a17c67f85c tests/test-topic-debugcb.t
diff -r 740e1267be6f -r d3a17c67f85c tests/test-topic-stack-complex.t
diff -r 740e1267be6f -r d3a17c67f85c tests/test-topic-stack-data.t
diff -r 740e1267be6f -r d3a17c67f85c tests/test-topic-stack.t
diff -r 740e1267be6f -r d3a17c67f85c tests/test-topic-tutorial.t
diff -r 740e1267be6f -r d3a17c67f85c tests/test-touch.t
diff -r 740e1267be6f -r d3a17c67f85c tests/test-tutorial.t
diff -r 740e1267be6f -r d3a17c67f85c tests/test-uncommit.t
diff -r 740e1267be6f -r d3a17c67f85c tests/test-unstable.t
diff -r 740e1267be6f -r d3a17c67f85c tests/test-userguide.t
diff -r 740e1267be6f -r d3a17c67f85c tests/test-wireproto.t