comparison tests/killdaemons.py @ 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 cc592295900f
children 88e61e45026d
comparison
equal deleted inserted replaced
802:80e078959129 803:b96d51a357bd