diff options
Diffstat (limited to 'lib/gitlab/conflict/file_collection.rb')
| -rw-r--r-- | lib/gitlab/conflict/file_collection.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/conflict/file_collection.rb b/lib/gitlab/conflict/file_collection.rb index 047600af267..c4ee1dafe20 100644 --- a/lib/gitlab/conflict/file_collection.rb +++ b/lib/gitlab/conflict/file_collection.rb @@ -7,14 +7,14 @@ module Gitlab attr_reader :merge_request, :resolver - def initialize(merge_request) + def initialize(merge_request, allow_tree_conflicts: false) our_commit = merge_request.source_branch_head.raw their_commit = merge_request.target_branch_head.raw @target_repo = merge_request.target_project.repository @source_repo = merge_request.source_project.repository.raw @our_commit_id = our_commit.id @their_commit_id = their_commit.id - @resolver = Gitlab::Git::Conflict::Resolver.new(@target_repo.raw, @our_commit_id, @their_commit_id) + @resolver = Gitlab::Git::Conflict::Resolver.new(@target_repo.raw, @our_commit_id, @their_commit_id, allow_tree_conflicts: allow_tree_conflicts) @merge_request = merge_request end |