The FileDiffCollectionMixin incorrectly assumed that counts would

always be integers. However, before chunks are generated, some line

counts may be None. This patch works around that limitation and

returns the correct result for that case. Unit tests have been added to

test this behaviour.

Ran unit tests.