From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 14 Sep 2017 08:40:38 +0000 (+0900)
Subject: Merge branch 'kw/merge-recursive-cleanup' into next
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9f20025e6b5614fa5498bf91b9192740bc4d95b2

Merge branch 'kw/merge-recursive-cleanup' into next

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
---

9f20025e6b5614fa5498bf91b9192740bc4d95b2