clean up merge squash and no-commit messages in pgm
Change-Id: Iffa6e8752fbd94f3ef69f49df772be82e3da5d05
This commit is contained in:
parent
59baf9148e
commit
b42b50fdf5
|
@ -69,7 +69,7 @@ mergeCheckoutConflict=error: Your local changes to the following files would be
|
|||
mergeFailed=Automatic merge failed; fix conflicts and then commit the result
|
||||
mergeCheckoutFailed=Please, commit your changes or stash them before you can merge.
|
||||
mergeMadeBy=Merge made by the ''{0}'' strategy.
|
||||
mergedSquashed=Squash commit -- not updating HEAD\nAutomatic merge went well; stopped before committing as requested
|
||||
mergedSquashed=Squash commit -- not updating HEAD
|
||||
mergeWentWellStoppedBeforeCommitting=Automatic merge went well; stopped before committing as requested
|
||||
metaVar_DAG=DAG
|
||||
metaVar_KEY=KEY
|
||||
|
|
|
@ -182,6 +182,7 @@ protected void run() throws Exception {
|
|||
case FAST_FORWARD_SQUASHED:
|
||||
case MERGED_SQUASHED_NOT_COMMITTED:
|
||||
outw.println(CLIText.get().mergedSquashed);
|
||||
outw.println(CLIText.get().mergeWentWellStoppedBeforeCommitting);
|
||||
break;
|
||||
case ABORTED:
|
||||
throw die(CLIText.get().ffNotPossibleAborting);
|
||||
|
|
Loading…
Reference in New Issue