t / t5100 / msg0016on commit merge-recursive: apply necessary modifications for directory renames (3b9616f)
   1and some content
   2