RelNoteson commit merge-recursive: check for directory level conflicts (53e32d4)
   1Documentation/RelNotes/2.16.0.txt