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

diff --cc merge-recursive.c
Simple merge