Use git-merge instead of git-resolve in git-pull.
[gitweb.git] / mozilla-sha1 /
drwxr-xr-x   parent (dest: ; base: f887564ab72e107bcdee3ba83c91e2bb4ae13ca7)
-rw-r--r-- 4486 sha1.c
-rw-r--r-- 1723 sha1.h