Merge branch 'sp/make'
[git] / contrib / examples /
drwxr-xr-x   ..
-rwxr-xr-x 2715 git-resolve.sh