tests: add tests for resolving content-divergence with parent change
This patch adds a new test file test-evolve-content-divergence.t which tests the
resolution of content divergence when the divergent changesets does not have the
same parents.
all: tutorials/tutorial.rst tutorials/topic-tutorial.rst static/logo-evolve.ico
sphinx-build . ../html/
tutorials/tutorial.rst: tutorials/tutorial.t test2rst.py
python test2rst.py tutorials/
tutorials/topic-tutorial.rst: tutorials/topic-tutorial.t test2rst.py
python test2rst.py tutorials/
static/logo-evolve.ico: static/logo-evolve.svg
convert -resize 36x36 static/logo-evolve.svg static/logo-evolve.ico