From a0fd31463b8b391ff940e97706ba064608feb1e1 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 6 Apr 2006 22:29:55 -0700 Subject: Match ofs/cnt types in diff interface. Signed-off-by: Junio C Hamano --- combine-diff.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'combine-diff.c') diff --git a/combine-diff.c b/combine-diff.c index 4657eb4c33..eb0d757f47 100644 --- 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; -- cgit v1.2.3