t / t5100 / msg0016on commit Be more user-friendly when refusing to do something because of conflict. (d38a30d)
   1and some content
   2