t / t5100 / patch0007on commit Be more user-friendly when refusing to do something because of conflict. (d38a30d)
   1