Mark as MERGE WITH CONFLICTS all merge commits that include the word 'Conflicts:'

Problem Definition

At the moment, a merge commit is marked as MERGE WITH CONFLICTS only if the word 'Conflicts:', with the colon, is included in the commit message, at the beginning of the row:

Many Git clients generate automatically a commit message like the following for merge commits with conflicts:

Merged v60-hotfixes into master

# Conflicts:
#   foo.php
#   bar.php
#   foobar.php

Merge commits with extra characters before Conflicts: are not highlighted by Bitbucket. They look like regular merge commits:

Suggested Solution

Label a merge commit as MERGE WITH CONFLICTS if it includes the word 'Conflicts:' anywhere in the commit message