Merge "Remove DifferenceEngine::generateDiffBody()"