merge-recursive: Fix code checking for D/F conflicts still being present
[gitweb.git] / ppc /
drwxr-xr-x   parent (dest: ; base: f2507b4e0ef0b7fc8c1e75004e8a86a0430dc512)
-rw-r--r-- 1470 sha1.c
-rw-r--r-- 559 sha1.h
-rw-r--r-- 7443 sha1ppc.S