t / t5100 / info0016on commit merge-recursive: check for file level conflicts then get new name (f6f7755)
   1Author: A U Thor
   2Email: a.u.thor@example.com
   3Subject: check bogus body header (date)
   4Date: bogus 
   5