merge-recursive: avoid spurious rename/rename conflict from dir renames
[gitweb.git] / t / t3901 /
drwxr-xr-x   parent (dest: t; base: febb3a86098f853066c2623c2392f156710dd40f)
-rwxr-xr-x 153 8859-1.txt
-rwxr-xr-x 155 utf8.txt