Merge branch 'jk/difftool-dir-diff-edit-fix'
[gitweb.git] / contrib / subtree / t /
drwxr-xr-x   parent (dest: contrib/subtree; base: 18973d8ac9e396d0eefdf36d7c6aa43aa7d396a6)
-rw-r--r-- 1637 Makefile
-rwxr-xr-x 13419 t7900-subtree.sh