RelNoteson commit merge-recursive: Fix multiple file rename across D/F conflict (ae74548)
   1Documentation/RelNotes-1.7.1.txt