diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2024-01-20 00:40:42 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2024-01-20 00:40:42 +0100 |
| commit | 03d465c49c7957fc51fcc3e2f32021913b113784 (patch) | |
| tree | 4061c8eef657cb91e98636d32d2133cb2a2105ea /org.eclipse.jgit/resources/org/eclipse/jgit/internal | |
| parent | 2a3bbae47a3358d97f3a5d61178c2448730c40db (diff) | |
| parent | b5bfa90a9e2deb13b5151e5d9885db741b2e7f7a (diff) | |
| download | jgit-03d465c49c7957fc51fcc3e2f32021913b113784.tar.gz jgit-03d465c49c7957fc51fcc3e2f32021913b113784.zip | |
Merge branch 'stable-6.7' into stable-6.8
* stable-6.7:
Introduce a PriorityQueue sorting RevCommits by commit timestamp
Remove org.eclipse.jgit.benchmark/.factorypath
Update jmh to 1.37 for org.eclipse.jgit.benchmark
Change-Id: I5d49a9dc7da17b83243229d4d8d3b9ee0a063e65
Diffstat (limited to 'org.eclipse.jgit/resources/org/eclipse/jgit/internal')
| -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 3798e3f5f8..c54c811b57 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -557,6 +557,7 @@ nothingToPush=Nothing to push. notMergedExceptionMessage=Branch was not deleted as it has not been merged yet; use the force option to delete it anyway notShallowedUnshallow=The server sent a unshallow for a commit that wasn''t marked as shallow: {0} noXMLParserAvailable=No XML parser available. +nullRevCommit=RevCommit is null numberDoesntFit=Number doesn't fit in a single byte objectAtHasBadZlibStream=Object at {0} in {1} has bad zlib stream objectIsCorrupt=Object {0} is corrupt: {1} |