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.
doc generated with sphinx. tutorial exported using sphinxedhghttp://hg.piranha.org.ua/sphinxedhg/