Merge pull request #1945 from libgit2/ntk/fix/merge_leaks

Plug git_merge() related leaks

src/merge.c

@@ -2451,6 +2451,7 @@ int git_merge(
 on_error:
 	git_repository_merge_cleanup(repo);
 
+	git_index_free(index_new);
 	git__free(result);
 
 done:

tests-clar/merge/workdir/setup.c

@@ -1019,6 +1019,7 @@ void test_merge_workdir_setup__retained_after_success(void)
 
 	git_merge_head_free(our_head);
 	git_merge_head_free(their_heads[0]);
+	git_merge_result_free(result);
 }
 
 void test_merge_workdir_setup__removed_after_failure(void)
@@ -1051,4 +1052,5 @@ void test_merge_workdir_setup__removed_after_failure(void)
 
 	git_merge_head_free(our_head);
 	git_merge_head_free(their_heads[0]);
+	git_merge_result_free(result);
 }