RelNoteson commit merge-recursive: Make room for directories in D/F conflicts (ef02b31)
   1Documentation/RelNotes/1.7.3.txt