Fall back to three-way merge when applying a patch.
[gitweb.git] / ppc /
drwxr-xr-x   parent (dest: ; base: 47f0b6d5)
-rw-r--r-- 1419 sha1.c
-rw-r--r-- 396 sha1.h
-rw-r--r-- 3711 sha1ppc.S