# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1554229935 -7200
# Node ID 05f8908df4ce158779aba6571f220fa28d0de556
# Parent  e8515ee7a7cc0281d905f762e26e8956ccfd7f74# Parent  7d54a538dd1eefb7ac20d68b95cd5285057c0f21
branching: merge with stable

diff -r e8515ee7a7cc -r 05f8908df4ce hgext3rd/evolve/__init__.py
diff -r e8515ee7a7cc -r 05f8908df4ce hgext3rd/evolve/cmdrewrite.py
diff -r e8515ee7a7cc -r 05f8908df4ce hgext3rd/evolve/compat.py
diff -r e8515ee7a7cc -r 05f8908df4ce hgext3rd/evolve/evolvecmd.py
diff -r e8515ee7a7cc -r 05f8908df4ce hgext3rd/topic/topicmap.py