Change-Id: Ia0e73208b86c45a3d96698e973f6e70ec5cb7303 Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>tags/v1.2.0.201112221803-r
@@ -210,7 +210,9 @@ public class MergeCommand extends GitCommand<MergeResult> { | |||
unmergedPaths = resolveMerger.getUnmergedPaths(); | |||
} else | |||
noProblems = merger.merge(headCommit, srcCommit); | |||
refLogMessage.append(": Merge made by "); | |||
refLogMessage.append(mergeStrategy.getName()); | |||
refLogMessage.append('.'); | |||
if (noProblems) { | |||
DirCacheCheckout dco = new DirCacheCheckout(repo, | |||
headCommit.getTree(), repo.lockDirCache(), |