Merge "patchoat: take directories instead of filenames"