diff options
| author | Tomasz Zarna <tomasz.zarna@tasktop.com> | 2013-04-04 16:31:07 +0200 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2013-04-08 09:51:00 -0400 |
| commit | b42b50fdf532d2e89dbce9052385f3abaf442860 (patch) | |
| tree | 3fca817b6e354cedd314a0488d923de2130f1280 /org.eclipse.jgit.pgm/resources | |
| parent | 59baf9148e4b16028203d9e881136ab4c005202c (diff) | |
| download | jgit-b42b50fdf532d2e89dbce9052385f3abaf442860.tar.gz jgit-b42b50fdf532d2e89dbce9052385f3abaf442860.zip | |
clean up merge squash and no-commit messages in pgm
Change-Id: Iffa6e8752fbd94f3ef69f49df772be82e3da5d05
Diffstat (limited to 'org.eclipse.jgit.pgm/resources')
| -rw-r--r-- | org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties | 2 |
1 files changed, 1 insertions, 1 deletions
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 |