From 8d057f774506fc98b225580f7cfd74e9cef008cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Thu, 8 Nov 2018 14:37:18 +0100 Subject: [PATCH] Hide details --- .../main/java/sonia/scm/repository/spi/GitMergeCommand.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java index a060c0fecc..6376262228 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java @@ -23,7 +23,8 @@ import java.io.IOException; public class GitMergeCommand extends AbstractGitCommand implements MergeCommand { private static final Logger logger = LoggerFactory.getLogger(GitMergeCommand.class); - public static final String MERGE_COMMIT_MESSAGE_TEMPLATE = + + private static final String MERGE_COMMIT_MESSAGE_TEMPLATE = "Merge of branch %s into %s\n" + "\n" + "Automatic merge by SCM-Manager.";