From b42b50fdf532d2e89dbce9052385f3abaf442860 Mon Sep 17 00:00:00 2001 From: Tomasz Zarna Date: Thu, 4 Apr 2013 16:31:07 +0200 Subject: [PATCH] clean up merge squash and no-commit messages in pgm Change-Id: Iffa6e8752fbd94f3ef69f49df772be82e3da5d05 --- .../resources/org/eclipse/jgit/pgm/CLIText.properties | 2 +- org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties index 07d9c00c7..43b6f1776 100644 --- a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties +++ b/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 diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java index e25ac4f3e..0a149016e 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java @@ -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);