diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2021-06-25 22:23:47 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2021-06-25 22:23:47 +0200 |
| commit | bbb1c7f6451cef69bd98191bfdf4db04da003ecf (patch) | |
| tree | 7a143bb41919ce49b95c05486eeda5547363114b /org.eclipse.jgit/resources | |
| parent | e2dc4b9c6445f91da73437e2ccc9729d86f776e2 (diff) | |
| parent | 24d6d605388c82201092cf1699b51095299380a2 (diff) | |
| download | jgit-bbb1c7f6451cef69bd98191bfdf4db04da003ecf.tar.gz jgit-bbb1c7f6451cef69bd98191bfdf4db04da003ecf.zip | |
Merge branch 'stable-5.9' into stable-5.10
* stable-5.9:
Retry loose object read upon "Stale file handle" exception
Ignore missing javadoc in test bundles
Change-Id: I56fc2c47193a891285a705d44b3507f23982dc8a
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 c52e307814..861ebcaeda 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -419,6 +419,7 @@ logInconsistentFiletimeDiff={}: inconsistent duration from file timestamps on {} logLargerFiletimeDiff={}: inconsistent duration from file timestamps on {}, {}: diff = {} > {} (last good value). Aborting measurement. logSmallerFiletime={}: got smaller file timestamp on {}, {}: {} < {}. Aborting measurement at resolution {}. logXDGConfigHomeInvalid=Environment variable XDG_CONFIG_HOME contains an invalid path {} +looseObjectHandleIsStale=loose-object {0} file handle is stale. retry {1} of {2} maxCountMustBeNonNegative=max count must be >= 0 mergeConflictOnNonNoteEntries=Merge conflict on non-note entries: base = {0}, ours = {1}, theirs = {2} mergeConflictOnNotes=Merge conflict on note {0}. base = {1}, ours = {2}, theirs = {2} |