Merge "clean up merge squash and no-commit messages in pgm"

org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties

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

org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java

@@ -182,6 +182,7 @@ class Merge extends TextBuiltin {
 		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);