Silence non-externalized string warning in CherryPickCommand

Change-Id: I8c06635ce655470b5b650fa5c0c546e64445420c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java
index 0a6875dbc2df9a6fd7a75213fb4ba8c599e8608b..d6e930adac0a40c9586a525f4aaa2b6c9c4d6207 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java
@@ -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