[master] three-way choice for cp_files