Parcourir la source
Add a case statement for fast-forward merge
This case was ommitted. Treat the same as a non-fastworwad merge. Change-Id: Ia81e2430dfe04c3ce9b6e2f8fb4b6c646293a174tags/v2.2.0.201212191850-r
Robin Rosenberg
il y a 11 ans
1 fichiers modifiés avec 1 ajouts et 0 suppressions
+ 1
- 0
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java
Voir le fichier
| outw.println(MessageFormat.format(CLIText.get().mergeMadeBy, name)); | outw.println(MessageFormat.format(CLIText.get().mergeMadeBy, name)); | ||||
| break; | break; | ||||
| case MERGED_SQUASHED: | case MERGED_SQUASHED: | ||||
| case FAST_FORWARD_SQUASHED: | |||||
| outw.println(CLIText.get().mergedSquashed); | outw.println(CLIText.get().mergedSquashed); | ||||
| break; | break; | ||||
| case ABORTED: | case ABORTED: |
Chargement…