RelNoteson commit merge-recursive: Provide more info in conflict markers with file renames (3c217c0)
   1Documentation/RelNotes/1.7.5.4.txt