RelNoteson commit merge-recursive: check for file level conflicts then get new name (f6f7755)
   1Documentation/RelNotes/2.18.0.txt