t / t3900 / 1-UTF-8.txton commit mergetool: honor diff.orderFile (57937f7)
   1ÄËÑÏÖ
   2
   3Ábçdèfg