merge-one-file: use empty- or common-base condintionally in two-stage merge.
[gitweb.git] / compat /
drwxr-xr-x   parent (dest: ; base: fd66dbf5297a)
-rw-r--r-- 794 mmap.c
-rw-r--r-- 438 strcasestr.c
-rw-r--r-- 39931 subprocess.py