Skip to main content

Browse the archive

Revision 4fc970c43884e6215c13d6944a2def1eb2134ed5 authored by Junio C Hamano on 26 February 2007, 06:24:47 UTC, committed by Junio C Hamano on 26 February 2007, 06:25:30 UTC 
diff --cc: fix display of symlink conflicts during a merge.
 
"git-diff-files --cc" to show conflicts during merge did not pass
the correct mode information for the working tree down, and showed
bogus combined diff.

Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 0b1f647
Raw File
blob.h 
#ifndef BLOB_H
#define BLOB_H

#include "object.h"

extern const char *blob_type;

struct blob {
	struct object object;
};

struct blob *lookup_blob(const unsigned char *sha1);

int parse_blob_buffer(struct blob *item, void *buffer, unsigned long size);

int parse_blob(struct blob *item);

#endif /* BLOB_H */
back to top