merge-recursive: Avoid doubly merging rename/add conflict contents
[gitweb.git] / contrib / hooks /
drwxr-xr-x   parent (dest: contrib; base: 2a669c341a857f53d946dec762e6f22a54b12dd2)
-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