t / t3900 / 1-UTF-8.txton commit cherry-pick/revert: add scissors line on merge conflict (1a2b985)
   1ÄËÑÏÖ
   2
   3Ábçdèfg