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:
parent
67edd3eda7
commit
8b06c46e30
|
@ -161,6 +161,7 @@ protected void run() throws Exception {
|
||||||
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:
|
||||||
|
|
Loading…
Reference in New Issue