# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1434742755 25200
# Node ID 20ff4ef75b8769a3541b27ce75d4197ee0b30738
# Parent  362e2c8c5677e49aa4fb8ef4e61d7ad133b3e5a5# Parent  ff43167ed0ba60038304a08621bda4cbac5e6224
merge with some old heads

diff -r 362e2c8c5677 -r 20ff4ef75b87 hgext/evolve.py
diff -r 362e2c8c5677 -r 20ff4ef75b87 tests/test-evolve.t