diff options
author | Matthias Sohn <matthias.sohn@sap.com> | 2020-04-18 00:30:15 +0200 |
---|---|---|
committer | Matthias Sohn <matthias.sohn@sap.com> | 2020-04-18 00:30:15 +0200 |
commit | a0aebbd52899c21eedc9b021f595e45da07820d2 (patch) | |
tree | a9d8508bc243180973a3a62bcb7aef6442f9d9a4 /org.eclipse.jgit/resources/org/eclipse | |
parent | 0eeed6ad2b93f9f9712803cfec288bb0f094dd17 (diff) | |
parent | a79c5b1f1046f4b41928bc40ab433155168dacc6 (diff) | |
download | jgit-a0aebbd52899c21eedc9b021f595e45da07820d2.tar.gz jgit-a0aebbd52899c21eedc9b021f595e45da07820d2.zip |
Merge branch 'stable-5.6' into stable-5.7
* stable-5.6:
Remove double blank from sentence start
Bump Bazel version to 3.0.0
Change-Id: I26c3a8345020239d1c2ec5c6f70a633b43ddab86
Diffstat (limited to 'org.eclipse.jgit/resources/org/eclipse')
-rw-r--r-- | org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties | 2 |
1 files changed, 1 insertions, 1 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 1218ee612d..18361316a2 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -302,7 +302,7 @@ flagNotFromThis={0} not from this. flagsAlreadyCreated={0} flags already created. funnyRefname=funny refname gcFailed=Garbage collection failed. -gcTooManyUnpruned=Too many loose, unpruneable objects after garbage collection. Consider adjusting gc.auto or gc.pruneExpire. +gcTooManyUnpruned=Too many loose, unpruneable objects after garbage collection. Consider adjusting gc.auto or gc.pruneExpire. gpgFailedToParseSecretKey=Failed to parse secret key file in directory: {0}. Is the entered passphrase correct? gpgNoCredentialsProvider=missing credentials provider gpgNoKeyring=neither pubring.kbx nor secring.gpg files found |