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