test-evolve-bumped: add new test case for merge
Before this patch we were not testing our warning message for bumped changesets
that are the product of a merge. This patch adds a test case for that.
all: tutorials/tutorial.rst static/logo-evolve.ico
sphinx-build . ../html/
tutorials/tutorial.rst: tutorials/tutorial.t
python test2rst.py tutorials/
static/logo-evolve.ico: static/logo-evolve.svg
convert -resize 36x36 static/logo-evolve.svg static/logo-evolve.ico