DiffUtils::ResolveAll