diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2018-05-10 11:59:56 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2018-05-10 11:59:56 +0200 |
| commit | 1887c834772d9e035b50ebda4922aa5c8159a31f (patch) | |
| tree | 7034915434b5906ea897cee9d732c6b57e198f9b /org.eclipse.jgit/resources/org/eclipse | |
| parent | 5f79ef0ba495dbcf03eb4923ae7ce039fc8ab4ec (diff) | |
| parent | 9253a6c5caea9cd95d5839f155c4e9434b16b6ab (diff) | |
| download | jgit-1887c834772d9e035b50ebda4922aa5c8159a31f.tar.gz jgit-1887c834772d9e035b50ebda4922aa5c8159a31f.zip | |
Merge branch 'stable-4.6' into stable-4.7
* stable-4.6:
Retry stale file handles on .git/config file
Change-Id: If5a21d38224528edfc551b3216daca6a2582e3ac
Diffstat (limited to 'org.eclipse.jgit/resources/org/eclipse')
| -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 03065da8ad..68bb68e426 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -126,6 +126,7 @@ commitMessageNotSpecified=commit message not specified commitOnRepoWithoutHEADCurrentlyNotSupported=Commit on repo without HEAD currently not supported commitAmendOnInitialNotPossible=Amending is not possible on initial commit. compressingObjects=Compressing objects +configHandleIsStale=config file handle is stale, {0}. retry connectionFailed=connection failed connectionTimeOut=Connection time out: {0} contextMustBeNonNegative=context must be >= 0 |