saltstack/salt — pull request #11985 by toumorokoshi (2014-04-14 19:35:23+00:00)
Title: Fixes #11966, clearer interface for files.copy

* adds recurse flag (required when copying directories)
* adds (merge|remove)_existing, to choose whether to keep existing files, or delete the target directory entirely.