diff options
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merge.c b/src/merge.c index b72b3843b..05a776e45 100644 --- a/src/merge.c +++ b/src/merge.c @@ -1024,7 +1024,7 @@ static int index_entry_similarity_calc( { git_blob *blob; git_diff_file diff_file = {{{0}}}; - git_off_t blobsize; + git_object_size_t blobsize; int error; *out = NULL; |