git-merge documentation: describe how conflict is presented
[gitweb.git] / mozilla-sha1 /
drwxr-xr-x   parent (dest: ; base: 70a3f89733a4cd21631690ba980598fea2249067)
-rw-r--r-- 4488 sha1.c
-rw-r--r-- 1720 sha1.h