diff options
Diffstat (limited to 'app/views/projects/merge_requests/conflicts/components/_parallel_conflict_lines.html.haml')
-rw-r--r-- | app/views/projects/merge_requests/conflicts/components/_parallel_conflict_lines.html.haml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/views/projects/merge_requests/conflicts/components/_parallel_conflict_lines.html.haml b/app/views/projects/merge_requests/conflicts/components/_parallel_conflict_lines.html.haml new file mode 100644 index 00000000000..a8ecdf59393 --- /dev/null +++ b/app/views/projects/merge_requests/conflicts/components/_parallel_conflict_lines.html.haml @@ -0,0 +1,4 @@ +%parallel-conflict-lines{"inline-template" => "true", ":file" => "file"} + %table + %tr.line_holder.parallel{"v-for" => "section in file.parallelLines"} + %td{"is"=>"parallel-conflict-line", "v-for" => "line in section", ":line" => "line", ":file" => "file"} |