test: get rid of all reference to conflicting changesets They are now called divergent for a long time.

doc generated with sphinx. tutorial exported using sphinxedhg

http://hg.piranha.org.ua/sphinxedhg/