t7405: add a directory/submodule conflict
[git/gitster.git] / contrib / subtree / t / 
tree7478a71e199477110c1eb5260b8721545134318e
drwxr-xr-x   ..
-rw-r--r-- 2322 Makefile
-rwxr-xr-x 35161 t7900-subtree.sh