t / t5100 / info0003on commit merge & sequencer: turn "Conflicts:" hint into a comment (261f315)
   1Author: A U Thor
   2Email: a.u.thor@example.com
   3Subject: third patch
   4Date: Fri, 9 Jun 2006 00:44:16 -0700
   5