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 <junkio@cox.net>

diff --git a/combine-diff.c b/combine-diff.c
index c45d7736592f483c5c454c9571bb62c1e7835707..e519583650c16ab4077c834f409658c63b6d5a06 100644 (file)
--- 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)