am --skip: revert changes introduced by failed 3way merge
[git] / contrib / subtree / t /
drwxr-xr-x   ..
-rw-r--r-- 1637 Makefile
-rwxr-xr-x 13438 t7900-subtree.sh