diff options
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 |