Commit 53760e8d authored by Fatih Acet's avatar Fatih Acet

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
parents 96eb6fd3 5c6d653b
......@@ -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 || []"
/>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment