Split merge conflict messages on 2 lines

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Split merge conflict messages on 2 lines
ab6aa8a4 · Dmitriy Zaporozhets · 912233ec · ab6aa8a4
Unverified Commit ab6aa8a4 authored Aug 06, 2015 by Dmitriy Zaporozhets
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

_conflicts.html.haml .../projects/merge_requests/widget/open/_conflicts.html.haml +2 -1

No files found.
--- a/app/views/projects/merge_requests/widget/open/_conflicts.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_conflicts.html.haml
 - 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