From b42b50fdf532d2e89dbce9052385f3abaf442860 Mon Sep 17 00:00:00 2001 From: Tomasz Zarna Date: Thu, 4 Apr 2013 16:31:07 +0200 Subject: clean up merge squash and no-commit messages in pgm Change-Id: Iffa6e8752fbd94f3ef69f49df772be82e3da5d05 --- org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'org.eclipse.jgit.pgm/resources/org/eclipse') 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 07d9c00c7e..43b6f17768 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 -- cgit v1.2.3