Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Aniszczyk2011-07-12 13:53:51 +0000
committerCode Review2011-07-12 13:53:51 +0000
commitf0060f64a77b00e5cb164039eeae854c7aff38d0 (patch)
treed7068af61b2fc0076161baa7ce984f3ce402e78e /org.eclipse.jgit.pgm
parentad74bbf9c1744823e32c96a9de9d53576ddb7d9d (diff)
parent1efecaa9f980fac828ab291cc31caa2d3e212081 (diff)
downloadjgit-f0060f64a77b00e5cb164039eeae854c7aff38d0.tar.gz
jgit-f0060f64a77b00e5cb164039eeae854c7aff38d0.tar.xz
jgit-f0060f64a77b00e5cb164039eeae854c7aff38d0.zip
Merge "Merge in JGit CLI is missing break statement"
Diffstat (limited to 'org.eclipse.jgit.pgm')
-rw-r--r--org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java1
1 files changed, 1 insertions, 0 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 73ab2b2aee..7928a2877b 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
@@ -114,6 +114,7 @@ class Merge extends TextBuiltin {
case MERGED:
out.println(MessageFormat.format(CLIText.get().mergeMadeBy,
mergeStrategy.getName()));
+ break;
case NOT_SUPPORTED:
out.println(MessageFormat.format(
CLIText.get().unsupportedOperation, result.toString()));

Back to the top