projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'jc/combine' into next
[git.git]
/
combine-diff.c
diff --git
a/combine-diff.c
b/combine-diff.c
index
3a0ec61
..
9bd27f8
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)