RelNoteson commit merge-recursive: Fix code checking for D/F conflicts still being present (f2507b4)
   1Documentation/RelNotes/1.7.5.4.txt