merge-recursive: remove return value from get_files_dirs