Bug introduced in c93f84be Now that we duplicate on request "before" doing the copy, we always want to merge directories.
mentioned in issue #154