From 1efecaa9f980fac828ab291cc31caa2d3e212081 Mon Sep 17 00:00:00 2001 From: Tomasz Zarna Date: Tue, 12 Jul 2011 11:51:03 +0200 Subject: [PATCH] Merge in JGit CLI is missing break statement Change-Id: I2095601b848e66e54d5dac828ef6ed1a4c5ae66c Signed-off-by: Chris Aniszczyk --- org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java | 1 + 1 file changed, 1 insertion(+) 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())); -- 2.39.5