Make sure that --delete-excluded does not elide a per-dir merge