diff options
author | Matthias Sohn <matthias.sohn@sap.com> | 2024-02-21 18:18:31 +0100 |
---|---|---|
committer | Matthias Sohn <matthias.sohn@sap.com> | 2024-02-21 18:18:31 +0100 |
commit | 5481bfda90e403d49156b04446b06a8efd304449 (patch) | |
tree | 0b802d663c5dbbd8802d3018bfd5513284d29ca0 /org.eclipse.jgit/resources | |
parent | 3d4a4bd9303c5ec524e375291f4250093be2bec4 (diff) | |
parent | 9377d3190d668827a24a5ff0c7ad9eeacb19bb7d (diff) | |
download | jgit-5481bfda90e403d49156b04446b06a8efd304449.tar.gz jgit-5481bfda90e403d49156b04446b06a8efd304449.zip |
Merge branch 'stable-6.8'
* stable-6.8:
Delete org.eclipse.jgit.ssh.apache.agent/bin/.project
Allow to discover bitmap on disk created after the packfile
Change-Id: I08095dfaefb963876d993383cb35acc6b75d7691
Diffstat (limited to 'org.eclipse.jgit/resources')
-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 aa9a1774ef..bbfd0b0d3a 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. bitmapUseNoopNoListener=Use NOOP instance for no listener |