t7405: add a file/submodule conflict
[gitweb.git] / t / t4034 / java /
drwxr-xr-x   parent (dest: t/t4034; base: 594a8673f227e9a00b3b0c4d6a26c97d68651666)
-rw-r--r-- 2121 expect
-rw-r--r-- 271 post
-rw-r--r-- 253 pre