Split merge conflict messages on 2 lines

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2026-08-15 15:46:08 +10:00 · 2015-08-06 17:22:45 +02:00
parent 912233ecd3
commit ab6aa8a48b
1 changed files with 2 additions and 1 deletions
@@ -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