/app/assets/javascripts/merge_conflicts/components/

• ../
• diff_file_editor.js.es6
• inline_conflict_lines.js.es6
• parallel_conflict_lines.js.es6