diff options
Diffstat (limited to 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/combine-diff.c b/combine-diff.c index acf39ec69a..ad5d1778b7 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -343,7 +343,7 @@ struct combine_diff_state { struct sline *lost_bucket; }; -static void consume_line(void *state_, char *line, unsigned long len) +static void consume_line(void *state_, char *line, size_t len) { struct combine_diff_state *state = state_; if (5 < len && !memcmp("@@ -", line, 4)) { |