diff options
Diffstat (limited to 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/combine-diff.c b/combine-diff.c index c45d773659..e519583650 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) |