merge-recursive: Make room for directories in D/F conflicts
[gitweb.git] / ppc /
drwxr-xr-x   parent (dest: ; base: ef02b317212443036be6007bba3a1a5946460dc9)
-rw-r--r-- 1470 sha1.c
-rw-r--r-- 559 sha1.h
-rw-r--r-- 7443 sha1ppc.S