t / t3900 / 1-UTF-8.txton commit conflict_rename_delete(): Check whether D/F conflicts are still present (a0de2f6)
   1ÄËÑÏÖ
   2
   3Ábçdèfg