merge-one-file: use empty- or common-base condintionally in two-stage merge.
[gitweb.git] / mozilla-sha1 /
drwxr-xr-x   parent (dest: ; base: fd66dbf5297a4badec8c2accf8a0f9bd72e3f693)
-rw-r--r-- 4498 sha1.c
-rw-r--r-- 1729 sha1.h