RelNoteson commit read-cache: fix directory/file conflict handling in read_index_unmerged() (ad37620)
   1Documentation/RelNotes/2.18.0.txt