t / t3900 / 1-UTF-8.txton commit rerere: teach rerere to handle nested conflicts (4af3220)
   1ÄËÑÏÖ
   2
   3Ábçdèfg