Add a case statement for fast-forward merge

This case was ommitted. Treat the same as a non-fastworwad
merge.

Change-Id: Ia81e2430dfe04c3ce9b6e2f8fb4b6c646293a174

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 e79a8ff0a8fc2583424516ed8c2543c704d256bf..6fe68810a14268318ad650ccebba18d850b0db9c 100644 (file)
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java
@@ -161,6 +161,7 @@ class Merge extends TextBuiltin {
                        outw.println(MessageFormat.format(CLIText.get().mergeMadeBy, name));
                        break;
                case MERGED_SQUASHED:
+               case FAST_FORWARD_SQUASHED:
                        outw.println(CLIText.get().mergedSquashed);
                        break;
                case ABORTED: