fix incorrect directory listings after fast-copy merges.

* Was not storing listing directory when setting the length on merged files.
Merge branch 'master' into strict_file_checking