t / t5100 / msg0006on commit Be more user-friendly when refusing to do something because of conflict. (d38a30d)
   1Here is a patch from A U Thor.
   2