t / t5100 / msg0016--no-inbody-headerson commit rerere: teach rerere to handle nested conflicts (4af3220)
   1Date: bogus
   2
   3and some content
   4