Skip to content
Snippets Groups Projects
Commit 4da40269 authored by Junio C Hamano's avatar Junio C Hamano
Browse files

Merge branch 'ps/plug-xdl-merge-leak' into maint 

* ps/plug-xdl-merge-leak:
  xdiff/xmerge: fix memory leak in xdl_merge
parents 08e21c9b 4867f118
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 7 additions and 2 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment