RelNoteson commit revert: clarify label on conflict hunks (d685654)
   1Documentation/RelNotes-1.7.1.txt