merge-recursive: check for directory level conflicts
[gitweb.git] / t / t5004 /
drwxr-xr-x   parent (dest: t; base: 53e32d4652a5cb073c8add8e7867fd7e76c2deff)
-rw-r--r-- 7373 big-pack.zip
-rw-r--r-- 10240 empty-with-pax-header.tar
-rw-r--r-- 62 empty.zip