Merge branch 'jk/doc-format-patch-skips-merges'
[git] / contrib / subtree / t /
drwxr-xr-x   ..
-rw-r--r-- 2322 Makefile
-rwxr-xr-x 51718 t7900-subtree.sh