Use Daniel's read-tree in the merge strategy 'resolve'.
[gitweb.git] / mozilla-sha1 /
drwxr-xr-x   parent (dest: ; base: 2276aa6c098a0337bc2bec49742e332bdd1b802c)
-rw-r--r-- 4486 sha1.c
-rw-r--r-- 1723 sha1.h