Compare directory contents after merging.

This currently shows discrepancies, so I've filed tickets and made STRICT_FILE_CHECKING an env arg (keeping travis happy).