Match ofs/cnt types in diff interface.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-06 22:29:55 -07:00
parent f2f880f537
commit a0fd31463b
3 changed files with 8 additions and 7 deletions
--- a/combine-diff.c
+++ b/combine-diff.c
@ -151,7 +151,8 @@ static void append_lost(struct sline *sline, int n, const char *line, int len)
 struct combine_diff_state {
 	struct xdiff_emit_state xm;

-	unsigned int lno, ob, on, nb, nn;
+	unsigned int lno;
+	int ob, on, nb, nn;
 	unsigned long nmask;
 	int num_parent;
 	int n;