t / t3900 / ISO-8859-1.txton commit git-add: no need for -f when resolving a conflict in already tracked path (6e4f981)
   1ÄËÑÏÖ
   2
   3Ábçdèfg