diff options
Diffstat (limited to 'lib/gitlab/conflict/file_collection.rb')
| -rw-r--r-- | lib/gitlab/conflict/file_collection.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/conflict/file_collection.rb b/lib/gitlab/conflict/file_collection.rb index a4a1505bb7d..695dafa9e20 100644 --- a/lib/gitlab/conflict/file_collection.rb +++ b/lib/gitlab/conflict/file_collection.rb @@ -5,7 +5,7 @@ module Gitlab def initialize(merge_request) @merge_request = merge_request - @our_commit = merge_request.diff_head_commit.raw.raw_commit + @our_commit = merge_request.source_branch_head.raw.raw_commit @their_commit = merge_request.target_branch_head.raw.raw_commit end |