aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Zarna2011-07-12 05:51:03 (EDT)
committerChris Aniszczyk2011-07-12 09:48:53 (EDT)
commit1efecaa9f980fac828ab291cc31caa2d3e212081 (patch)
tree5037172fe0c96cfb056ff215e65f0dac32eee1ca
parentb19924f150f463c5962e6d4c2c20ae42226f9a09 (diff)
downloadjgit-1efecaa9f980fac828ab291cc31caa2d3e212081.zip
jgit-1efecaa9f980fac828ab291cc31caa2d3e212081.tar.gz
jgit-1efecaa9f980fac828ab291cc31caa2d3e212081.tar.bz2
Merge in JGit CLI is missing break statementrefs/changes/65/3865/2
Change-Id: I2095601b848e66e54d5dac828ef6ed1a4c5ae66c Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
-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 73ab2b2..7928a28 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()));