motiejus
/
jgit
1
Fork 0
Code Releases Activity

Add a case statement for fast-forward merge 

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

Change-Id: Ia81e2430dfe04c3ce9b6e2f8fb4b6c646293a174
This commit is contained in:
Robin Rosenberg 2012-11-25 21:11:28 +01:00
parent 67edd3eda7
commit 8b06c46e30
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -161,6 +161,7 @@ protected void run() throws Exception {
outw.println(MessageFormat.format(CLIText.get().mergeMadeBy, name));
break;
case MERGED_SQUASHED:
case FAST_FORWARD_SQUASHED:
outw.println(CLIText.get().mergedSquashed);
break;
case ABORTED: