diff options
| -rw-r--r-- | src/merge.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/merge.c b/src/merge.c index 29184f67b..186c77037 100644 --- a/src/merge.c +++ b/src/merge.c @@ -1726,13 +1726,13 @@ int git_merge__iterators( } } - if (!given_opts || !given_opts->metric) - git__free(opts.metric); - error = index_from_diff_list(out, diff_list, (opts.tree_flags & GIT_MERGE_TREE_SKIP_REUC)); done: + if (!given_opts || !given_opts->metric) + git__free(opts.metric); + git_merge_diff_list__free(diff_list); git_iterator_free(empty_ancestor); git_iterator_free(empty_ours); |