Plug git_merge() related leaks
Merge pull request #1945 from libgit2/ntk/fix/merge_leaks

Plug git_merge() related leaks