t / t5100 / msg0011on commit Be more user-friendly when refusing to do something because of conflict. (d38a30d)
   1Here comes a commit log message, and
   2its second line is here.