Merge branch...

Merge branch '48897-mr-refactor-parallel-and-diff-view-are-being-rendered-at-the-same-time' into 'master'

Resolve "MR refactor: parallel and diff view are being rendered at the same time"

Closes #48897

See merge request gitlab-org/gitlab-ce!20440

app/assets/javascripts/diffs/components/diff_content.vue

@@ -39,12 +39,12 @@ export default {
     <div class="diff-viewer">
       <template v-if="isTextFile">
         <inline-diff-view
-          v-show="isInlineView"
+          v-if="isInlineView"
           :diff-file="diffFile"
           :diff-lines="diffFile.highlightedDiffLines || []"
         />
         <parallel-diff-view
-          v-show="isParallelView"
+          v-if="isParallelView"
           :diff-file="diffFile"
           :diff-lines="diffFile.parallelDiffLines || []"
         />