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/src/org/eclipse | |
| 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/src/org/eclipse')
| -rw-r--r-- | org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java | 1 |
1 files changed, 1 insertions, 0 deletions
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); |