t / t5100 / msg0016on commit t6042: add testcase covering rename/add/delete conflict type (11d9ade)
   1and some content
   2