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
tags/v2.2.0.201212191850-r
Robin Rosenberg 11 years ago
parent
commit
8b06c46e30
1 changed files with 1 additions and 0 deletions
  1. 1
    0
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java

+ 1
- 0
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java View File

@@ -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