Merge branch 'jk/difftool-in-subdir'
[gitweb.git] / contrib / subtree / t /
drwxr-xr-x   parent (dest: contrib/subtree; base: 5a5d3f1f1255559080f754fb202887f1566d8db3)
-rw-r--r-- 2322 Makefile
-rwxr-xr-x 35161 t7900-subtree.sh