Allow one-way tree merge to remove old files