Merge branch 'rt/cherry-revert-conflict-summary'
[gitweb.git] / contrib / subtree / t /
drwxr-xr-x   parent (dest: contrib/subtree; base: f5b121aef305398a3e462b28240c0d6d754315c1)
-rw-r--r-- 1637 Makefile
-rwxr-xr-x 13282 t7900-subtree.sh