diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2012-12-12 09:02:28 -0600 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2012-12-12 09:02:28 -0600 |
| commit | c6ad440250d6c438cc622df42ced436199e03dac (patch) | |
| tree | c96e94358b00ff3043844a2b7f825100b9a1963d /tests-clar/merge/simple.c | |
| parent | c52573f62b4935aaf1b16c689adb904b09f5570e (diff) | |
| download | libgit2-merge.tar.gz | |
fix some memleaksmerge
Diffstat (limited to 'tests-clar/merge/simple.c')
| -rw-r--r-- | tests-clar/merge/simple.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests-clar/merge/simple.c b/tests-clar/merge/simple.c index 974c37c54..37880be4f 100644 --- a/tests-clar/merge/simple.c +++ b/tests-clar/merge/simple.c @@ -98,6 +98,8 @@ static git_merge_result *merge_simple_branch(int resolve_flags, int conflict_fla opts.merge_trees_opts.resolve_flags = resolve_flags; opts.conflict_flags = conflict_flags; cl_git_pass(git_merge(&result, repo, (const git_merge_head **)their_heads, 1, &opts)); + + git_merge_head_free(their_heads[0]); return result; } |