diff options
Diffstat (limited to 'org.eclipse.jgit.pgm')
| -rw-r--r-- | org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java | 1 |
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())); |