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

View File

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