t / t5100 / msg0001on commit merge-recursive: Provide more info in conflict markers with file renames (3c217c0)
   1Here is a patch from A U Thor.
   2