Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-07 05:55:44 +01:00
Code Issues Packages Projects Releases Activity

Hide details

Browse Source
This commit is contained in:
René Pfeuffer
2018-11-08 14:37:18 +01:00
parent 3c70ca7aa5
commit 8d057f7745
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
View File

@@ -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.";