RelNoteson commit merge-recursive: Have conflict_rename_delete reuse modify/delete code (e03acb8)
   1Documentation/RelNotes/1.7.5.4.txt