summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/merge.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/merge.c b/src/merge.c
index 42fbd79c9..24b7d37ce 100644
--- a/src/merge.c
+++ b/src/merge.c
@@ -2629,9 +2629,8 @@ int git_merge(
on_error:
merge_state_cleanup(repo);
- git_index_free(index_new);
-
done:
+ git_index_free(index_new);
git_index_free(index_repo);
git_tree_free(ancestor_tree);