diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2021-06-26 16:37:59 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2021-06-26 16:37:59 +0200 |
| commit | d46af8c69d598b63301900758e49b6b260168c16 (patch) | |
| tree | 3e7fe3fc41152817e21dab0c7c4b43abc3a282cf /org.eclipse.jgit/resources | |
| parent | 6976a30f443ece4815a977b0a5a897c0236018f7 (diff) | |
| parent | 8bd0161c83c54911be59bbfdee00eeb9c1f6adb9 (diff) | |
| download | jgit-d46af8c69d598b63301900758e49b6b260168c16.tar.gz jgit-d46af8c69d598b63301900758e49b6b260168c16.zip | |
Merge branch 'stable-5.12'
* stable-5.12:
Retry loose object read upon "Stale file handle" exception
Ignore missing javadoc in test bundles
Change-Id: I67c613c066a3252f9b0d0a3dcc026b57e10bfe1d
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 848d20aba9..33e7452d96 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -442,6 +442,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} |