RelNoteson commit trailer: reuse ignore_non_trailer() to ignore conflict lines (61cfef4)
   1Documentation/RelNotes/2.2.0.txt