RFR: merge-bot: update merge conflict message

Wed Mar 25 14:11:12 UTC 2020

On Wed, 25 Mar 2020 14:06:03 GMT, Erik Helin <ehelin at openjdk.org> wrote:

> Hi all,
> 
> please review this patch that updates the message in automatic merge conflict
> pull requests. For an example, see <https://github.com/openjdk/panama-foreign/pull/49>.
> 
> Testing:
> - `make test` passes on Linux x64
> 
> Thanks,
> Erik

Looks good, well done!

-------------

Marked as reviewed by rwestberg (Reviewer).

PR: https://git.openjdk.java.net/skara/pull/540