From 7435b879a62f636a82c7a004b91ea291019a0b1e Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Mon, 14 Jul 2014 12:11:01 +0200 Subject: Error message needs to be correct. --- app/controllers/projects/merge_requests_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') 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 -- cgit v1.2.3