summaryrefslogtreecommitdiff
path: root/src/merge.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/merge.c')
-rw-r--r--src/merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merge.c b/src/merge.c
index 1c841bdfb..d838e4ba9 100644
--- a/src/merge.c
+++ b/src/merge.c
@@ -2369,7 +2369,7 @@ done:
git_annotated_commit_free(other);
git_annotated_commit_free(new_base);
- git_oidarray_free(&bases);
+ git_oidarray_dispose(&bases);
git_array_clear(head_ids);
return error;
}