RelNoteson commit merge-recursive: check for directory level conflicts (96e7ffb)
   1Documentation/RelNotes/2.18.0.txt