t / t5100 / msg0018on commit t6042: add testcase covering rename/add/delete conflict type (11d9ade)
   1a commit message
   2