Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
upload-pack: optionally allow fetching reachable sha1
[gitweb.git]
/
merge-recursive.c
diff --git
a/merge-recursive.c
b/merge-recursive.c
index 771f5e21b09aac6976297b8a6e9028f90787a764..1c9c30db6cbf229a2f836113c04bb980340ce7eb 100644
(file)
--- a/
merge-recursive.c
+++ b/
merge-recursive.c
@@
-1858,6
+1858,9
@@
int merge_trees(struct merge_options *o,
string_list_clear(re_head, 0);
string_list_clear(entries, 1);
+ free(re_merge);
+ free(re_head);
+ free(entries);
}
else
clean = 1;