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>
This commit is contained in:
parent
740659519e
commit
8bc7574b63
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user