checkout -m --conflict=diff3: add a label for ancestor
[git/gsoc2010-gitweb.git] / block-sha1 / 
tree5732b8c38be6a35dec0471868fa9c5051156e621
drwxr-xr-x   ..
-rw-r--r-- 8497 sha1.c
-rw-r--r-- 692 sha1.h