RelNoteson commit t3508 (cherry-pick): futureproof against unmerged files (18c8ff4)
   1Documentation/RelNotes-1.7.2.txt