merge-recursive: avoid spurious rename/rename conflict from dir renames
[gitweb.git] / t / t8005 /
drwxr-xr-x   parent (dest: t; base: 6e7e027fe5f4a8d61597a86e7f2b6087e23a759c)
-rw-r--r-- 66 euc-japan.txt
-rw-r--r-- 56 sjis.txt
-rw-r--r-- 71 utf8.txt