Merge branch 'jc/merge-x-theirs-docfix'
[gitweb.git] / contrib / subtree / t /
drwxr-xr-x   parent (dest: contrib/subtree; base: 4da3e234f5a3989328c4dc8368cf5906f8679b30)
-rw-r--r-- 2322 Makefile
-rwxr-xr-x 35161 t7900-subtree.sh