# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1435279120 25200
# Node ID 8ca31deb8db77f24a0d66f900404267224db1d33
# Parent  9be1cadf7a07a0ee35b908dfc16e560673bf2ade# Parent  1bcbd14cf159291ad6de83ffdc5003f3ee8295c5
merge with stable

(restore test for Mercurial default branch

diff --git a/hgext/evolve.py b/hgext/evolve.py
diff --git a/setup.py b/setup.py
diff --git a/tests/test-amend.t b/tests/test-amend.t
diff --git a/tests/test-corrupt.t b/tests/test-corrupt.t
diff --git a/tests/test-evolve-bumped.t b/tests/test-evolve-bumped.t
diff --git a/tests/test-evolve.t b/tests/test-evolve.t
diff --git a/tests/test-inhibit.t b/tests/test-inhibit.t
diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
diff --git a/tests/test-sharing.t b/tests/test-sharing.t
diff --git a/tests/test-simple4server.t b/tests/test-simple4server.t
diff --git a/tests/test-stabilize-result.t b/tests/test-stabilize-result.t
diff --git a/tests/test-tutorial.t b/tests/test-tutorial.t
diff --git a/tests/test-uncommit.t b/tests/test-uncommit.t
diff --git a/tests/test-wireproto-bundle1.t b/tests/test-wireproto-bundle1.t
diff --git a/tests/test-wireproto.t b/tests/test-wireproto.t