t / t5100 / msg0016on commit merge-recursive: Provide more info in conflict markers with file renames (3c217c0)
   1and some content
   2