t / t4252 / file-2-0on commit Be more user-friendly when refusing to do something because of conflict. (d38a30d)
   11
   22
   33
   44
   55
   66
   77