t / t5100 / patch0007on commit t6042: add testcase covering rename/add/delete conflict type (11d9ade)
   1