t / t3900 / ISO-8859-1.txton commit merge.conflictstyle: choose between "merge" and "diff3 -m" styles (b541248)
   1ÄËÑÏÖ
   2
   3Ábçdèfg