RelNoteson commit merge-recursive: Fix modify/delete resolution in the recursive case (ec61d14)
   1Documentation/RelNotes/1.7.5.4.txt