t / t3900 / 1-UTF-8.txton commit rerere: do not skip two conflicted paths next to each other. (ab242f8)
   1ÄËÑÏÖ
   2
   3Ábçdèfg