diff options
Diffstat (limited to 'src/merge_file.c')
-rw-r--r-- | src/merge_file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merge_file.c b/src/merge_file.c index 0878866bc..986fbf9fe 100644 --- a/src/merge_file.c +++ b/src/merge_file.c @@ -108,7 +108,7 @@ int git_merge_file_input_from_diff_file( return 0; if ((error = git_repository_odb(&odb, repo)) < 0 || - (error = git_odb_read(&input->odb_object, odb, &file->oid)) < 0) + (error = git_odb_read(&input->odb_object, odb, &file->id)) < 0) goto done; input->mode = file->mode; |