diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-07-14 12:11:01 +0200 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-07-14 12:11:01 +0200 |
| commit | 7435b879a62f636a82c7a004b91ea291019a0b1e (patch) | |
| tree | daa0cc37593dbc51500a4b8a27755458db2ea377 /app/controllers/projects/merge_requests_controller.rb | |
| parent | 207bc8a0e70be38e49cd28bee1bc0b6bea50687a (diff) | |
| download | gitlab-ce-7435b879a62f636a82c7a004b91ea291019a0b1e.tar.gz | |
Error message needs to be correct.
Diffstat (limited to 'app/controllers/projects/merge_requests_controller.rb')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 6576580ea53..bdd614973b7 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -105,7 +105,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController @suppress_diff = Commit::diff_suppress?(@diffs, diff_line_count) @force_suppress_diff = @suppress_diff rescue Gitlab::Satellite::BranchesWithoutParent - @error = "Selected branches have no common commit so they cannot be compared." + @error = "Selected branches have no common commit so they cannot be merged." end end end |