t / t3900 / UTF-16.txton commit merge-recursive: avoid clobbering untracked files with directory renames (79c4759)
   1