Add 'ours' merge strategy.
[gitweb.git] / compat /
drwxr-xr-x   parent (dest: ; base: 64da9e604eea25c9c20cfe12618285ccd0bf3cfe)
-rw-r--r-- 794 mmap.c
-rw-r--r-- 438 strcasestr.c
-rw-r--r-- 39931 subprocess.py