Changeset: 92cc5c5c Author: Erik Helin <ehelin at openjdk.org> Date: 2020-03-25 14:19:12 +0000 URL: https://git.openjdk.java.net/skara/commit/92cc5c5c merge-bot: update merge conflict message Reviewed-by: rwestberg ! bots/merge/src/main/java/org/openjdk/skara/bots/merge/MergeBot.java