Browse Source

Add a case statement for fast-forward merge

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

Change-Id: Ia81e2430dfe04c3ce9b6e2f8fb4b6c646293a174
stable-2.2
Robin Rosenberg 12 years ago
parent
commit
8b06c46e30
  1. 1
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java

1
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:

Loading…
Cancel
Save