X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=combine-diff.c;fp=combine-diff.c;h=9bd27f82ec1d7c313987325a4948a5eed8c9b799;hb=02376287ffd8b37ea7622fd4b61d654855112e75;hp=3a0ec618432265740990fba63b480b68aa41a6f8;hpb=72c159f642a33255b76fff512f2a8c3aff9f5dca;p=git.git

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