t / t5100 / msg0009on commit merge & sequencer: turn "Conflicts:" hint into a comment (261f315)
   1This is to fix diff-format documentation.
   2