Fix sentence for i18n44895-explicit-merge-conflict

1 files changed, 4 insertions, 6 deletions

diff --git a/app/views/projects/merge_requests/conflicts/_submit_form.html.haml b/app/views/projects/merge_requests/conflicts/_submit_form.html.haml
index ebcb37ab5b2..b86a87a1fc6 100644
--- a/app/views/projects/merge_requests/conflicts/_submit_form.html.haml
+++ b/app/views/projects/merge_requests/conflicts/_submit_form.html.haml
@@ -1,15 +1,13 @@
+- branch_name = link_to @merge_request.source_branch, project_tree_path(@merge_request.project, @merge_request.source_branch), class: "ref-name"
+- translation =_('You can resolve the merge conflict using either the Interactive mode, by choosing %{use_ours} or %{use_theirs} buttons, or by editing the files directly. Commit these changes into %{branch_name}') % { use_ours: '<code>Use Ours</code>', use_theirs: '<code>Use Theirs</code>', branch_name: branch_name }
+
 %hr
 .form-horizontal.resolve-conflicts-form
   .form-group
     .col-md-4
       %h4= _('Resolve conflicts on source branch')
       .resolve-info
-        #{ _('You can resolve the merge conflict using either the Interactive mode, by choosing') }
-        %code Use ours
-        #{ _('or') }
-        %code Use theirs
-        #{ _('buttons, or by editing the files directly. Commit these changes into') }
-        #{link_to @merge_request.source_branch, project_tree_path(@merge_request.project, @merge_request.source_branch), class: "ref-name"}.
+        = translation.html_safe
     .col-md-8
       %label.label-light{ "for" => "commit-message" }
         #{ _('Commit message') }