t / t3900 / ISO-8859-1.txton commit xdiff-merge: optionally show conflicts in "diff3 -m" style (e0af48e)
   1ÄËÑÏÖ
   2
   3Ábçdèfg