Change-Id: I8c06635ce655470b5b650fa5c0c546e64445420c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>tags/v4.0.0.201505050340-m2
@@ -152,7 +152,7 @@ public class CherryPickCommand extends GitCommand<CherryPickResult> { | |||
ResolveMerger merger = (ResolveMerger) strategy.newMerger(repo); | |||
merger.setWorkingTreeIterator(new FileTreeIterator(repo)); | |||
merger.setBase(srcParent.getTree()); | |||
merger.setCommitNames(new String[] { "BASE", ourName, | |||
merger.setCommitNames(new String[] { "BASE", ourName, //$NON-NLS-1$ | |||
cherryPickName }); | |||
if (merger.merge(newHead, srcCommit)) { | |||
if (AnyObjectId.equals(newHead.getTree().getId(), merger |