t / t3900 / ISO8859-1.txton commit merge-recursive: Fix D/F conflicts (3734893)
   1ÄËÑÏÖ
   2
   3Ábçdèfg