since r28862 (whose typo is fixed in 29088), content_md5 property also differs. so number of conflicts is increaded by one. also add a test fo confirm which properties differ.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@29496 20353a03-c40f-0410-a6d1-a30d3c3de9de