diff options
Diffstat (limited to 'lib/gitlab')
| -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 e8157fb9e91..bbd0427a2c8 100644 --- a/lib/gitlab/conflict/file_collection.rb +++ b/lib/gitlab/conflict/file_collection.rb @@ -46,7 +46,7 @@ module Gitlab end <<EOM.chomp -Merge branch '#{merge_request.source_branch}' into '#{merge_request.target_branch}' +Merge branch '#{merge_request.target_branch}' into '#{merge_request.source_branch}' # Conflicts: #{conflict_filenames.join("\n")} |