t / t5100 / msg0015on commit merge-recursive: Provide more info in conflict markers with file renames (3c217c0)
   1  - a list
   2  - of stuff