aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Zarna2013-04-04 10:31:07 (EDT)
committerGerrit Code Review @ Eclipse.org2013-04-08 09:51:00 (EDT)
commitb42b50fdf532d2e89dbce9052385f3abaf442860 (patch)
tree3fca817b6e354cedd314a0488d923de2130f1280
parent59baf9148e4b16028203d9e881136ab4c005202c (diff)
downloadjgit-b42b50fdf532d2e89dbce9052385f3abaf442860.zip
jgit-b42b50fdf532d2e89dbce9052385f3abaf442860.tar.gz
jgit-b42b50fdf532d2e89dbce9052385f3abaf442860.tar.bz2
clean up merge squash and no-commit messages in pgmrefs/changes/39/11639/2
-rw-r--r--org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties2
-rw-r--r--org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java1
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 07d9c00..43b6f17 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 e25ac4f..0a14901 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);