Merge branch 'se/doc-checkout-ours-theirs' into maint
[gitweb.git] / contrib / subtree / t /
drwxr-xr-x   parent (dest: contrib/subtree; base: 204ea3cad443df4f14623a09ee8201a552f067af)
-rw-r--r-- 1637 Makefile
-rwxr-xr-x 12459 t7900-subtree.sh