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
strbuf.h 
#ifndef STRBUF_H
#define STRBUF_H
struct strbuf {
	int alloc;
	int len;
	int eof;
	char *buf;
};

extern void strbuf_init(struct strbuf *);
extern void read_line(struct strbuf *, FILE *, int);

#endif /* STRBUF_H */
back to top