t / t5100 / info0003on commit Merge branch 'jc/maint-add-u-remove-conflicted' (f39e4cf)
   1Author: A U Thor
   2Email: a.u.thor@example.com
   3Subject: third patch
   4Date: Fri, 9 Jun 2006 00:44:16 -0700
   5