t / t5100 / msg0016--no-inbody-headerson commit merge-recursive: Have conflict_rename_delete reuse modify/delete code (e03acb8)
   1Date: bogus
   2
   3and some content
   4