diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-08-05 12:15:06 +0100 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-12 23:24:48 +0300 |
| commit | ce7eb4e49279ab56cac992b6743fe77cac578b48 (patch) | |
| tree | 80f620351a9e2238ef50df8eeccbf1b5acc76c7e /lib/gitlab/conflict/file_collection.rb | |
| parent | f322c3027442b8f8c4800c19056bcd967be4018b (diff) | |
| download | gitlab-ce-ce7eb4e49279ab56cac992b6743fe77cac578b48.tar.gz | |
Add more tests for conflicts
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 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")} |