t7405: add a file/submodule conflict
[gitweb.git] / gitk-git /
drwxr-xr-x   parent (dest: ; base: 594a8673f227e9a00b3b0c4d6a26c97d68651666)
-rw-r--r-- 2208 Makefile
-rwxr-xr-x 351673 gitk
drwxr-xr-x - po