t / t5100 / rfc2047-info-0002on commit merge & sequencer: turn "Conflicts:" hint into a comment (261f315)
   1Author: Olle Järnefors
   2Email: ojarnef@admin.kth.se
   3Subject: Time for ISO 10646?
   4