Read about our upcoming Code of Conduct on this issue

Commit 7435b879 authored by Marin Jankovski's avatar Marin Jankovski
Browse files

Error message needs to be correct.

parent 3d798fea9fb8
......@@ -105,7 +105,7 @@ def new
@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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment