t / t5100 / msg0016--no-inbody-headerson commit rerere: recalculate conflict ID when unresolved conflict is committed (bd7dfa5)
   1Date: bogus
   2
   3and some content
   4