t / t5100 / info0016on commit cherry-pick/revert: add scissors line on merge conflict (1a2b985)
   1Author: A U Thor
   2Email: a.u.thor@example.com
   3Subject: check bogus body header (date)
   4Date: bogus 
   5