diff-contains-svn-conflict-file

This tag has been renamed to debian-adds-svn-conflict-file.