merge_recursive: Fix renames across paths below D/F conflicts
[gitweb.git] / ppc /
drwxr-xr-x   parent (dest: ; base: 5a2580d)
-rw-r--r-- 1470 sha1.c
-rw-r--r-- 559 sha1.h
-rw-r--r-- 7443 sha1ppc.S