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