t / t5100 / patch0008on commit merge & sequencer: turn "Conflicts:" hint into a comment (261f315)
   1