diff options
Diffstat (limited to 'lib/gitlab/gitaly_client/conflict_files_stitcher.rb')
| -rw-r--r-- | lib/gitlab/gitaly_client/conflict_files_stitcher.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/gitaly_client/conflict_files_stitcher.rb b/lib/gitlab/gitaly_client/conflict_files_stitcher.rb index 38ec910111c..b1278e3bfac 100644 --- a/lib/gitlab/gitaly_client/conflict_files_stitcher.rb +++ b/lib/gitlab/gitaly_client/conflict_files_stitcher.rb @@ -43,6 +43,7 @@ module Gitlab def conflict_from_gitaly_file_header(header) { + ancestor: { path: header.ancestor_path }, ours: { path: header.our_path, mode: header.our_mode }, theirs: { path: header.their_path } } |