Fix diff status handling.
*Never allow m_totalDiffStatus to be null *set MergeFileInfo structure correctly *drop uneeded const value parameter
BUG: 403799