summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflicts/components
ModeNameSize
-rw-r--r--diff_file_editor.js2956logplain
-rw-r--r--inline_conflict_lines.js478logplain
-rw-r--r--parallel_conflict_lines.js1367logplain