RelNoteson commit merge_content(): Check whether D/F conflicts are still present (4ab9a15)
   1Documentation/RelNotes/1.7.3.txt