Fall back to three-way merge when applying a patch.
[gitweb.git] / mozilla-sha1 /
drwxr-xr-x   parent (dest: ; base: 47f0b6d5)
-rw-r--r-- 4486 sha1.c
-rw-r--r-- 1723 sha1.h