t / t3900 / 1-UTF-8.txton commit merge: teach -Xours/-Xtheirs to binary ll-merge driver (a944af1)
   1ÄËÑÏÖ
   2
   3Ábçdèfg