Handle renamed files in file header.

app/assets/javascripts/merge_conflict_data_provider.js.es6

@@ -52,6 +52,7 @@ window.MergeConflictDataProvider = class MergeConflictDataProvider {
 
   setParallelLines(data) {
     data.files.forEach( (file) => {
+      file.filePath = this.getFilePath(file);
       file.parallelLines = { left: [], right: [] };
 
       file.sections.forEach( (section) => {
@@ -110,6 +111,7 @@ window.MergeConflictDataProvider = class MergeConflictDataProvider {
   setInlineLines(data) {
     data.files.forEach( (file) => {
       file.inlineLines = []
+      file.filePath = this.getFilePath(file);
 
       file.sections.forEach( (section) => {
         let currentLineType = 'new';
@@ -292,4 +294,10 @@ window.MergeConflictDataProvider = class MergeConflictDataProvider {
     }
   }
 
+
+  getFilePath(file) {
+    const { old_path, new_path } = file;
+    return old_path === new_path ? new_path : `${old_path} → ${new_path}`;
+  }
+
 }

app/views/projects/merge_requests/conflicts.html.haml

@@ -39,7 +39,7 @@
     .files{"v-if" => "isParallel"}
       .diff-file.file-holder.conflict.parallel-view{"v-for" => "file in conflictsData.files"}
         .file-title
-          %span {{file.new_path}}
+          %span {{{file.filePath}}}
           .file-actions
             %a.btn.btn-sm View file @{{conflictsData.shortCommitSha}}
 
@@ -66,10 +66,11 @@
                   %td.line_content
                     {{{line.richText}}}
 
+
     .files{"v-if" => "!isParallel"}
       .diff-file.file-holder.conflict.inline-view{"v-for" => "file in conflictsData.files"}
         .file-title
-          %span {{file.new_path}}
+          %span {{{file.filePath}}}
           .file-actions
             %a.btn.btn-sm View file @{{conflictsData.shortCommitSha}}