From: Junio C Hamano <junkio@cox.net>
Date: Wed, 12 Apr 2006 20:23:50 +0000 (-0700)
Subject: combine-diff: type fix.
X-Git-Tag: v1.3.0-rc4~16^2~1
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=8bc7574b6332ef45645c6e0917e9d59919b277ef;p=git.git

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 c45d7736..e5195836 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)