t / t5100 / msg0009on commit merge-recursive: Provide more info in conflict markers with file renames (3c217c0)
   1This is to fix diff-format documentation.
   2