t6036: add lots of detail for directory/file conflicts in recursive case
[gitweb.git] / gitk-git /
drwxr-xr-x   parent (dest: ; base: 327ac9cb9dda3ef8be5cc66a01daa32c6e8c8639)
-rw-r--r-- 2208 Makefile
-rwxr-xr-x 351673 gitk
drwxr-xr-x - po