From 8bc7574b6332ef45645c6e0917e9d59919b277ef Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 12 Apr 2006 13:23:50 -0700 Subject: [PATCH] combine-diff: type fix. The variable hunk_end points at a line number, which is represented as unsigned long by all the other variables. Signed-off-by: Junio C Hamano --- combine-diff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/combine-diff.c b/combine-diff.c index c45d77365..e51958365 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -506,8 +506,8 @@ static void dump_sline(struct sline *sline, unsigned long cnt, int num_parent) while (1) { struct sline *sl = &sline[lno]; - int hunk_end; - int rlines; + unsigned long hunk_end; + unsigned long rlines; while (lno <= cnt && !(sline[lno].flag & mark)) lno++; if (cnt < lno) -- 2.26.2