[Integrated] RFR: 378: Create merge conflict webrevs for "merge style" PRs without merge commit

[Robin Westberg]

Changeset: bd3b96da
Author:    Robin Westberg <rwestberg at openjdk.org>
Date:      2020-04-23 14:23:58 +0000
URL:       https://git.openjdk.java.net/skara/commit/bd3b96da

378: Create merge conflict webrevs for "merge style" PRs without merge commit

Reviewed-by: ehelin

! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ArchiveItem.java
! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ArchiveMessages.java
! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/WebrevDescription.java
! bots/mlbridge/src/test/java/org/openjdk/skara/bots/mlbridge/MailingListBridgeBotTests.java