app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19

/* eslint-disable no-param-reassign */

import Vue from 'vue';
import actionsMixin from '../mixins/line_conflict_actions';
import utilsMixin from '../mixins/line_conflict_utils';

((global) => {
  global.mergeConflicts = global.mergeConflicts || {};

  global.mergeConflicts.inlineConflictLines = Vue.extend({
    mixins: [utilsMixin, actionsMixin],
    props: {
      file: {
        type: Object,
        required: true,
      },
    },
  });
})(window.gl || (window.gl = {}));