merge-recursive: check for directory level conflicts
[gitweb.git] / t / t3901 /
drwxr-xr-x   parent (dest: t; base: 53e32d4652a5cb073c8add8e7867fd7e76c2deff)
-rwxr-xr-x 153 8859-1.txt
-rwxr-xr-x 155 utf8.txt