t / t3900 / 1-UTF-8.txton commit Be more user-friendly when refusing to do something because of conflict. (d38a30d)
   1ÄËÑÏÖ
   2
   3Ábçdèfg