t / t3900 / ISO8859-1.txton commit merge-recursive: avoid clobbering untracked files with directory renames (79c4759)
   1ÄËÑÏÖ
   2
   3Ábçdèfg