Merge branch 'sp/mergetool'
[gitweb.git] / contrib / hooks /
drwxr-xr-x   parent (dest: contrib; base: 6959893b0b65ebc68ce2fb524a8ec15a26ca4972)
-rw-r--r-- 18455 post-receive-email
-rw-r--r-- 6920 setgitperms.perl
-rw-r--r-- 11476 update-paranoid