Merge branch 'sm/show-superproject-while-conflicted'
[gitweb.git] / contrib / subtree / t /
drwxr-xr-x   parent (dest: contrib/subtree; base: d152a74e2584dd0e235c9bcc97ef6a9ed239994a)
-rw-r--r-- 2322 Makefile
-rwxr-xr-x 34876 t7900-subtree.sh