diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2024-02-21 17:41:44 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2024-02-21 17:47:28 +0100 |
| commit | 7ba0cfa0c1c91838af9dc1b551b73ae2c4dc40ef (patch) | |
| tree | 9b10aa7c7f1a69cdaf7831e08dc78a46dcab1e1a /org.eclipse.jgit/resources/org/eclipse/jgit | |
| parent | bf70c9f4c2e35548bc6d7853284b2c4d5e1d29ef (diff) | |
| parent | 89bf38087a9e9a0536742f5d9d408856e5ad2dc7 (diff) | |
| download | jgit-7ba0cfa0c1c91838af9dc1b551b73ae2c4dc40ef.tar.gz jgit-7ba0cfa0c1c91838af9dc1b551b73ae2c4dc40ef.zip | |
Merge branch 'stable-6.6' into stable-6.7
* stable-6.6:
Delete org.eclipse.jgit.ssh.apache.agent/bin/.project
Allow to discover bitmap on disk created after the packfile
Change-Id: I2bbc8c9a4ed45d37fa7ba63b2afd5511b6cf47a2
Diffstat (limited to 'org.eclipse.jgit/resources/org/eclipse/jgit')
| -rw-r--r-- | org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties index fe5fd4cfd6..177ceb167a 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -64,6 +64,8 @@ binaryHunkDecodeError=Binary hunk, line {0}: invalid input binaryHunkInvalidLength=Binary hunk, line {0}: input corrupt; expected length byte, got 0x{1} binaryHunkLineTooShort=Binary hunk, line {0}: input ended prematurely binaryHunkMissingNewline=Binary hunk, line {0}: input line not terminated by newline +bitmapAccessErrorForPackfile=Error whilst trying to access bitmap file for {} +bitmapFailedToGet=Failed to get bitmap index file {} bitmapMissingObject=Bitmap at {0} is missing {1}. bitmapsMustBePrepared=Bitmaps must be prepared before they may be written. blameNotCommittedYet=Not Committed Yet |