t / t5100 / msg0016on commit t6036: add lots of detail for directory/file conflicts in recursive case (327ac9c)
   1and some content
   2