Plug git_merge() related leaks