t / t5100 / msg0001on commit merge & sequencer: turn "Conflicts:" hint into a comment (261f315)
   1Here is a patch from A U Thor.
   2