t / t5100 / msg0016--no-inbody-headerson commit rerere: handle conflicts with multiple stage #1 entries (5eda906)
   1Date: bogus
   2
   3and some content
   4