merge-recursive: fix memleaks
commit473091e21ef2dbee6087cdf0429858faf2b50740
authorStefan Beller <sbeller@google.com>
Sat, 21 Mar 2015 00:28:04 +0000 (20 17:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Mar 2015 18:12:58 +0000 (23 11:12 -0700)
treee6c6dace9d3d3f51bb0900ed1bca2b3764626c61
parentd687839c29624de4b00ac22a6d8160172b357e14
merge-recursive: fix memleaks

These string_list instances were allocated by get_renames() and
get_unmerged for the sole use of this caller, and the function is
responsible for freeing them, not just their contents.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c