# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2017-01-19 13:04:19
# Node ID b48f493bb43f46d051c4b9424cc213658d648fa4
# Parent  639b2044c40ee1838382b044b4f79aa0b9d0e212

merge-logic: improve merge failed because of conflicts message.

diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py
--- a/rhodecode/model/pull_request.py
+++ b/rhodecode/model/pull_request.py
@@ -80,7 +80,7 @@ class PullRequestModel(BaseModel):
             'This pull request cannot be merged because of an unhandled'
             ' exception.'),
         MergeFailureReason.MERGE_FAILED: lazy_ugettext(
-            'This pull request cannot be merged because of conflicts.'),
+            'This pull request cannot be merged because of merge conflicts.'),
         MergeFailureReason.PUSH_FAILED: lazy_ugettext(
             'This pull request could not be merged because push to target'
             ' failed.'),
diff --git a/rhodecode/tests/models/test_pullrequest.py b/rhodecode/tests/models/test_pullrequest.py
--- a/rhodecode/tests/models/test_pullrequest.py
+++ b/rhodecode/tests/models/test_pullrequest.py
@@ -183,7 +183,7 @@ class TestPullRequestModel:
         assert status is False
         assert (
             msg.eval() ==
-            'This pull request cannot be merged because of conflicts.')
+            'This pull request cannot be merged because of merge conflicts.')
         self.merge_mock.assert_called_once_with(
             pull_request.target_ref_parts,
             pull_request.source_repo.scm_instance(),
@@ -200,7 +200,7 @@ class TestPullRequestModel:
         assert status is False
         assert (
             msg.eval() ==
-            'This pull request cannot be merged because of conflicts.')
+            'This pull request cannot be merged because of merge conflicts.')
         assert self.merge_mock.called is False
 
     def test_merge_status_unknown_failure(self, pull_request):