From 8b06c46e301e4b9df4b2f47d1e67fb4ab319ded5 Mon Sep 17 00:00:00 2001 From: Robin Rosenberg Date: Sun, 25 Nov 2012 21:11:28 +0100 Subject: [PATCH] Add a case statement for fast-forward merge This case was ommitted. Treat the same as a non-fastworwad merge. Change-Id: Ia81e2430dfe04c3ce9b6e2f8fb4b6c646293a174 --- 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 e79a8ff0a8..6fe68810a1 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 @@ -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: -- 2.39.5