Merge branch 'js/diffstat' into next

diff --git a/combine-diff.c b/combine-diff.c
index 3a0ec618432265740990fba63b480b68aa41a6f8..9bd27f82ec1d7c313987325a4948a5eed8c9b799 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)