From f0db57faed53036011b5b0d61ce91d17161f0475 Mon Sep 17 00:00:00 2001
From: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
Date: Fri, 25 Sep 2020 10:00:14 +0200
Subject: [PATCH] update CHANGELOG.md

---
 CHANGELOG.md                                                  | 1 +
 .../main/java/sonia/scm/repository/spi/GitMergeStrategy.java  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73be698524..fcea360605 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Handling of branch with slashes in source view ([#1340](https://github.com/scm-manager/scm-manager/pull/1340))
 - Detect not existing paths correctly in Mercurial ([#1343](https://github.com/scm-manager/scm-manager/pull/1343))
 - Return correct revisions for tags in hooks for git repositories ([#1344](https://github.com/scm-manager/scm-manager/pull/1344))
+- Do not handle manual merge commit messages as templates ([#1351](https://github.com/scm-manager/scm-manager/pull/1351))
 
 ## [2.5.0] - 2020-09-10
 ### Added
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeStrategy.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeStrategy.java
index 2409b347d0..a945cc78e6 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeStrategy.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeStrategy.java
@@ -90,7 +90,7 @@ abstract class GitMergeStrategy extends AbstractGitCommand.GitCloneWorker<MergeC
 
   Optional<RevCommit> doCommit() {
     logger.debug("merged branch {} into {}", branchToMerge, targetBranch);
-    return doCommit(determineMessageTemplate(), author, sign);
+    return doCommit(determineMessage(), author, sign);
   }
 
   MergeCommandResult createSuccessResult(String newRevision) {
@@ -105,7 +105,7 @@ abstract class GitMergeStrategy extends AbstractGitCommand.GitCloneWorker<MergeC
     return revisionToMerge;
   }
 
-  private String determineMessageTemplate() {
+  private String determineMessage() {
     if (Strings.isNullOrEmpty(messageTemplate)) {
       return MessageFormat.format(MERGE_COMMIT_MESSAGE_TEMPLATE, branchToMerge, targetBranch);
     } else {