t / t5100 / msg0009on commit Be more user-friendly when refusing to do something because of conflict. (d38a30d)
   1This is to fix diff-format documentation.
   2