pull-requests: added nicer formatting for merge conflicting files

rhodecode/apps/repository/tests/test_repo_pullrequests.py

@@ -261,7 +261,7 b' class TestPullrequestsView(object):'
             True, True, '', MergeFailureReason.MISSING_TARGET_REF,
             metadata={'target_ref': PullRequest.unicode_to_reference(unicode_reference)})
         response.assert_response().element_contains(
-            'span[data-role="merge-message"]', merge_resp.merge_status_message)
+            'div[data-role="merge-message"]', merge_resp.merge_status_message)
 
     def test_comment_and_close_pull_request_custom_message_approved(
             self, pr_util, csrf_token, xhr_header):

rhodecode/lib/vcs/backends/git/repository.py

@@ -990,7 +990,7 b' class GitRepository(BaseRepository):'
         except RepositoryError as e:
             log.exception('Failure when doing local merge on git shadow repo')
             if isinstance(e, UnresolvedFilesInRepo):
-                metadata['unresolved_files'] = 'file: ' + (', file: '.join(e.args[0]))
+                metadata['unresolved_files'] = '\n* conflict: ' + ('\n * conflict: '.join(e.args[0]))
 
             merge_possible = False
             merge_failure_reason = MergeFailureReason.MERGE_FAILED

rhodecode/lib/vcs/backends/hg/repository.py

@@ -830,7 +830,7 b' class MercurialRepository(BaseRepository'
             except RepositoryError as e:
                 log.exception('Failure when doing local merge on hg shadow repo')
                 if isinstance(e, UnresolvedFilesInRepo):
-                    metadata['unresolved_files'] = 'file: ' + (', file: '.join(e.args[0]))
+                    metadata['unresolved_files'] = '\n* conflict: ' + ('\n * conflict: '.join(e.args[0]))
 
                 merge_possible = False
                 merge_failure_reason = MergeFailureReason.MERGE_FAILED

rhodecode/templates/pullrequests/pullrequest_merge_checks.mako

@@ -18,14 +18,14 b''
         % for pr_check_key, pr_check_details in c.pr_merge_errors.items():
             <% pr_check_type = pr_check_details['error_type'] %>
             <li>
-                <span class="merge-message ${pr_check_type}" data-role="merge-message">
-                    - ${pr_check_details['message']}
+                <div class="merge-message ${pr_check_type}" data-role="merge-message">
+                    <span style="white-space: pre-line">- ${pr_check_details['message']}</span>
                     % if pr_check_key == 'todo':
                         % for co in pr_check_details['details']:
                             <a class="permalink" href="#comment-${co.comment_id}" onclick="Rhodecode.comments.scrollToComment($('#comment-${co.comment_id}'), 0, ${h.json.dumps(co.outdated)})"> #${co.comment_id}</a>${'' if loop.last else ','}
                         % endfor
                     % endif
-                </span>
+                </div>
             </li>
         % endfor
     </ul>