RelNoteson commit Be more user-friendly when refusing to do something because of conflict. (d38a30d)
   1Documentation/RelNotes-1.6.6.txt