Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Rosenberg2012-11-25 15:11:28 -0500
committerRobin Rosenberg2012-11-25 15:11:28 -0500
commit8b06c46e301e4b9df4b2f47d1e67fb4ab319ded5 (patch)
treea03f8920505e7bee1d8ee8d89cf97b442dbce199
parent67edd3eda77fb98673065501a2cf7c9d39db668c (diff)
downloadjgit-8b06c46e301e4b9df4b2f47d1e67fb4ab319ded5.tar.gz
jgit-8b06c46e301e4b9df4b2f47d1e67fb4ab319ded5.tar.xz
jgit-8b06c46e301e4b9df4b2f47d1e67fb4ab319ded5.zip
Add a case statement for fast-forward merge
This case was ommitted. Treat the same as a non-fastworwad merge. Change-Id: Ia81e2430dfe04c3ce9b6e2f8fb4b6c646293a174
-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 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:

Back to the top