RelNoteson commit merge-recursive: Cleanup and consolidation of rename_conflict_info (4f66dad)
   1Documentation/RelNotes/1.7.5.4.txt