diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2018-05-10 12:55:30 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2018-05-10 13:36:27 +0200 |
| commit | 9bdbb06324e7a38bd52b36734e96191578a0cc0c (patch) | |
| tree | d492a2e0cccad5729e26b1ba1327b442721dc70a /org.eclipse.jgit/resources | |
| parent | a263bb11733de8d8113c5ad72030785bc95ebf33 (diff) | |
| parent | 9fdc595cdddac5913a2f3d512cc7787bebc3b687 (diff) | |
| download | jgit-9bdbb06324e7a38bd52b36734e96191578a0cc0c.tar.gz jgit-9bdbb06324e7a38bd52b36734e96191578a0cc0c.zip | |
Merge branch 'stable-4.10' into stable-4.11
* stable-4.10:
Retry stale file handles on .git/config file
Change-Id: Ice5c8ae8c2992243a81da77e166406bc1930fe0e
Diffstat (limited to 'org.eclipse.jgit/resources')
| -rw-r--r-- | org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties | 1 |
1 files changed, 1 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 10139f9b89..e041b27f81 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -136,6 +136,7 @@ compressingObjects=Compressing objects configSubsectionContainsNewline=config subsection name contains newline configSubsectionContainsNullByte=config subsection name contains byte 0x00 configValueContainsNullByte=config value contains byte 0x00 +configHandleIsStale=config file handle is stale, {0}. retry connectionFailed=connection failed connectionTimeOut=Connection time out: {0} contextMustBeNonNegative=context must be >= 0 |