t / t5100 / rfc2047-info-0005on commit merge & sequencer: turn "Conflicts:" hint into a comment (261f315)
   1Subject: (a)
   2