Merge branch 'mm/discourage-commit-a-to-finish-conflict-resolution'
[gitweb.git] / contrib / subtree / t /
drwxr-xr-x   parent (dest: contrib/subtree; base: 785514bb5544fbe2604ea657530134671f82e4b1)
-rw-r--r-- 1637 Makefile
-rwxr-xr-x 13438 t7900-subtree.sh