t / t5100 / info0017on commit merge & sequencer: turn "Conflicts:" hint into a comment (261f315)
   1Author: A U Thor
   2Email: a.u.thor@example.com
   3Subject: A E I O U
   4Date: Mon, 17 Sep 2012 14:23:44 -0700
   5