From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 19 Sep 2017 01:47:56 +0000 (+0900)
Subject: Merge branch 'kw/merge-recursive-cleanup'
X-Git-Tag: v2.15.0-rc0~81
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6701263956ca5c0f13703d2f185e0aad81e928cb

Merge branch 'kw/merge-recursive-cleanup'

A leakfix and code clean-up.

* kw/merge-recursive-cleanup:
merge-recursive: change current file dir string_lists to hashmap
merge-recursive: remove return value from get_files_dirs
merge-recursive: fix memory leak
---

6701263956ca5c0f13703d2f185e0aad81e928cb