Merge branch 'rs/unpack-trees-plug-leak'
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Jun 2013 20:30:05 +0000 (13:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Jun 2013 20:30:05 +0000 (13:30 -0700)
* rs/unpack-trees-plug-leak:
unpack-trees: free cache_entry array members for merges
diff-lib, read-tree, unpack-trees: mark cache_entry array paramters const
diff-lib, read-tree, unpack-trees: mark cache_entry pointers const
unpack-trees: create working copy of merge entry in merged_entry
unpack-trees: factor out dup_entry
read-cache: mark cache_entry pointers const
cache: mark cache_entry pointers const

1  2 
cache.h
diff --cc cache.h
Simple merge