evolve: change in a test which demonstrate divergence resolution can break
This patch just add "--any" flag to "hg evolve --content-divergent" in
a test and changed output reflect that there is something which is not
handled correctly.
After looking into code I found that it is because of using a evolvestate
value which is not updated i.e evolvestate['divergent']
Next patch will fix this problem.
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