[PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges.
[git.git] / mozilla-sha1 /
drwxr-xr-x   ..
-rw-r--r-- 4486 sha1.c
-rw-r--r-- 1723 sha1.h