Merge branch 'nd/remote-plural-ours-plus-theirs'
[gitweb.git] / contrib / subtree / t /
drwxr-xr-x   parent (dest: contrib/subtree; base: 7a7d0854ff3cb1bc5b95e9295b9c11089d9a75a6)
-rw-r--r-- 2322 Makefile
-rwxr-xr-x 34591 t7900-subtree.sh