merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[gitweb.git] / contrib / hooks /
drwxr-xr-x   parent (dest: contrib; base: 86273e5764ab7faaa84c3de1a428ed24a6cfdf1f)
-rwxr-xr-x 20679 post-receive-email
-rw-r--r-- 1291 pre-auto-gc-battery
-rw-r--r-- 6920 setgitperms.perl
-rw-r--r-- 11647 update-paranoid