t / t5100 / msg0016--no-inbody-headerson commit rebase: show consistent conflict resolution hint (89c7ae9)
   1Date: bogus
   2
   3and some content
   4