diff options
Diffstat (limited to 'app/views/projects/merge_requests/widget/open/_conflicts.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/widget/open/_conflicts.html.haml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/widget/open/_conflicts.html.haml b/app/views/projects/merge_requests/widget/open/_conflicts.html.haml index d1db5fec43a..7dc3b4eb2cc 100644 --- a/app/views/projects/merge_requests/widget/open/_conflicts.html.haml +++ b/app/views/projects/merge_requests/widget/open/_conflicts.html.haml @@ -1,7 +1,8 @@ - if @merge_request.can_be_merged_by?(current_user) %h4 This merge request contains merge conflicts that must be resolved. - You can try it manually on the + %p + You can merge it manually using the %strong = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal" - else |