t / t5100 / msg0016--no-inbody-headerson commit merge: let custom strategies intervene in trivial merges (52b48ef)
   1Date: bogus
   2
   3and some content
   4