t / t5100 / msg0016--no-inbody-headerson commit Be more user-friendly when refusing to do something because of conflict. (d38a30d)
   1Date: bogus
   2
   3and some content
   4