diff tests/test-touch.t @ 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 af74a5cdf96b
children 802a87359017
line wrap: on
line diff