diff-contains-cvs-conflict-copy

This tag has been renamed to debian-adds-cvs-conflict-copy.