RelNoteson commit merge-recursive: rename conflict_rename_*() family of functions (8ebe7b0)
   1Documentation/RelNotes/2.18.0.txt