t / t5100 / msg0016on commit merge & sequencer: turn "Conflicts:" hint into a comment (261f315)
   1and some content
   2