t / t5100 / msg0016on commit merge-recursive: Delay content merging for renames (882fd11)
   1and some content
   2