Merge "have patchoat take directories instead of filenames"