RelNoteson commit merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir (86273e5)
   1Documentation/RelNotes-1.7.3.txt