Mercurial > evolve
diff docs/obs-concept.rst @ 803:b96d51a357bd
test: get rid of all reference to conflicting changesets
They are now called divergent for a long time.
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Thu, 20 Feb 2014 13:32:04 -0800 |
parents | 26f76b38f879 |
children |