t / t3900 / 1-UTF-8.txton commit t6036: add a failed conflict detection case with submodule modify/modify (d4d1718)
   1ÄËÑÏÖ
   2
   3Ábçdèfg