Fall back to three-way merge when applying a patch.
[gitweb.git] / compat /
drwxr-xr-x   parent (dest: ; base: 47f0b6d5)
-rw-r--r-- 438 strcasestr.c
-rw-r--r-- 39931 subprocess.py