t6042: add testcase covering rename/add/delete conflict type