RelNoteson commit merge-recursive: avoid spurious rename/rename conflict from dir renames (6e7e027)
   1Documentation/RelNotes/2.18.0.txt