diff options
| author | Christian Halstrick <christian.halstrick@sap.com> | 2013-04-09 03:09:33 -0400 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2013-04-09 03:09:33 -0400 |
| commit | 266ec24d4986253d62b463f8d1a6e5e040d393f7 (patch) | |
| tree | 88818e78b2bc00ba602ef53385464f91df7f6593 /org.eclipse.jgit.pgm | |
| parent | 0a824f59969721eafd45494cf7dade1ed4d0c4e8 (diff) | |
| parent | b42b50fdf532d2e89dbce9052385f3abaf442860 (diff) | |
| download | jgit-266ec24d4986253d62b463f8d1a6e5e040d393f7.tar.gz jgit-266ec24d4986253d62b463f8d1a6e5e040d393f7.zip | |
Merge "clean up merge squash and no-commit messages in pgm"
Diffstat (limited to 'org.eclipse.jgit.pgm')
| -rw-r--r-- | org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties | 2 | ||||
| -rw-r--r-- | org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java | 1 |
2 files changed, 2 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 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 e25ac4f3ef..0a149016e6 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 @@ 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); |