[PATCH] read-tree: update documentation for 3-way merge.

diff --git a/blob.c b/blob.c
index 280f5241577ac029e9d5a7eb5bf895642b342fc8..c800cd3905e2a4e97098064a588e15c0ae33a0b0 100644 (file)
--- a/blob.c
+++ b/blob.c
@@ -14,6 +14,8 @@ struct blob *lookup_blob(unsigned char *sha1)
                ret->object.type = blob_type;
                return ret;
        }
+       if (!obj->type)
+               obj->type = blob_type;
        if (obj->type != blob_type) {
                error("Object %s is a %s, not a blob", 
                      sha1_to_hex(sha1), obj->type);