diff options
| -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( |