Merge "fix diff against archived revision deleted version"