diff options
| author | David Pursehouse <david.pursehouse@gmail.com> | 2019-01-21 08:12:19 +0900 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@gmail.com> | 2019-01-21 11:03:46 +0900 |
| commit | c648a38a474add02a918ffed6a7e35a6bca1c9c6 (patch) | |
| tree | 19da56116c94722e69193e3ec9fac316b6337279 /org.eclipse.jgit.pgm/src | |
| parent | 9fee7512631474a8f595f39bac58cd1cfe6d5593 (diff) | |
| download | jgit-c648a38a474add02a918ffed6a7e35a6bca1c9c6.tar.gz jgit-c648a38a474add02a918ffed6a7e35a6bca1c9c6.zip | |
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>
Diffstat (limited to 'org.eclipse.jgit.pgm/src')
| -rw-r--r-- | org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java index 8b48bbd162..0b362a42f3 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java @@ -195,14 +195,11 @@ class Merge extends TextBuiltin { } 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( |