merge-recursive: avoid clobbering untracked files with directory renames
[gitweb.git] / t / t8005 /
drwxr-xr-x   parent (dest: t; base: 79c47598f5c8c0008ae9281f20c2a041d4cabd93)
-rw-r--r-- 66 euc-japan.txt
-rw-r--r-- 56 sjis.txt
-rw-r--r-- 71 utf8.txt