t / t5100 / msg0006on commit t6042: add testcase covering rename/add/delete conflict type (11d9ade)
   1Here is a patch from A U Thor.
   2