motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge: Avoid non-localised literal string warning for "recursive" 

Instead of using the literal string, take the name from the RECURSIVE
enum value.

Change-Id: I9d8f289232dfc8f784287029c41714ddbdee232b
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
This commit is contained in:
David Pursehouse 2019-01-21 08:12:19 +09:00
parent 9fee751263
commit c648a38a47
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java
View File

@ -195,14 +195,11 @@ protected void run() {
}
break;
case MERGED:
String name;
if (!isMergedInto(oldHead, src)) {
name = mergeStrategy.getName();
} else {
name = "recursive"; //$NON-NLS-1$
}
outw.println(
MessageFormat.format(CLIText.get().mergeMadeBy, name));
MergeStrategy strategy = isMergedInto(oldHead, src)
? MergeStrategy.RECURSIVE
: mergeStrategy;
outw.println(MessageFormat.format(CLIText.get().mergeMadeBy,
strategy.getName()));
break;
case MERGED_NOT_COMMITTED:
outw.println(